Revert "Issue #3471741 by mstrelan, bbrala, kristiaanvandeneynde: Fix null $cid in CacheCollector classes"
This reverts commit ed9ad3e5.
11.x
11.0.x
changed target branch from 11.x to 11.0.x