Commented out the cache