Fix for non-consistant collections from cache