Cache has been refactored