changes for caching