More work on caching.