Revert "Issue #3471741 by mstrelan, bbrala, kristiaanvandeneynde: Fix null $cid in CacheCollector classes"
This reverts commit ed9ad3e5.