Fix move when the two cache folders exist
# What does this PR do?

When doing local checkouts of PRs that predate the cache move, we end up with the two cache folders existing and the automatic move fails. This PR fixes that.
