Some renaming and refactoring of the cache classes