more caching changes