CacheSystem changes