admin/cache refactoring