some changes to caching.