Improved caching.