Refactoring collection cache