changes related to caching