Changed collection caching to be less complicated