Remove support for upgrading very old data on OSX.

Also clean up some missed cache_dir references.