Improved caching for collections