adding CacheContext feature