Refactor: Cleanup cache classes.