Start cache refactoring