Changes for cache