Fix for disabling caching.