Fixing caching.