Stop using a custom cache directory, and stop deleting the cache immediately. Also clean up related code.