Optimizations for CachedRepository