Revert "Play fast and loose with the cache file."

This reverts commit ef15a5eaf7a96d496cdfaad8c4939c3834b07bca.