Fixing up caching.