diff --git a/Parse/src/main/java/com/parse/ParseFileController.java b/Parse/src/main/java/com/parse/ParseFileController.java
index 4a7b05151..f5c3ea211 100644
--- a/Parse/src/main/java/com/parse/ParseFileController.java
+++ b/Parse/src/main/java/com/parse/ParseFileController.java
@@ -224,6 +224,10 @@ public Task<File> then(Task<Void> task) throws Exception {
               return task.cast();
             }
 
+            // Since we give the cacheFile pointer to developers, it is not safe to guarantee
+            // cacheFile always does not exist here, so it is better to delete it manually,
+            // otherwise moveFile may throw an exception.
+            ParseFileUtils.deleteQuietly(cacheFile);
             ParseFileUtils.moveFile(tempFile, cacheFile);
             return Task.forResult(cacheFile);
           }