Fix cache directory upgrading - do not try to remove the destination directory.
Merge pull request #2405 from discordier/fix-upgrade-cache

Fix cache directory upgrading - do not try to (re)move the active cache dir.