Improved caching.
Improved caching.