Revert "Keep the cache files... for now."

This reverts commit bf5c764ce82965e32f746199b86e121859167bf4.