Fixed caching issues with collections