Adds improved caching.