Reverted the collection cache