Cache refactoring is done