Fix cache directory upgrading - do not try to remove the destination directory.