Continue to improve CacheInterceptor