Refactoring Cache