further updates to caching.