Refactoring Cached