Improve caching.