diff --git a/Parse/src/main/java/com/parse/ParseAWSRequest.java b/Parse/src/main/java/com/parse/ParseAWSRequest.java
index cca56fee2..24df17c8f 100644
--- a/Parse/src/main/java/com/parse/ParseAWSRequest.java
+++ b/Parse/src/main/java/com/parse/ParseAWSRequest.java
@@ -56,7 +56,7 @@ public Void call() throws Exception {
         InputStream responseStream = null;
         try {
           responseStream = response.getContent();
-          FileOutputStream tempFileStream = new FileOutputStream(tempFile);
+          FileOutputStream tempFileStream = ParseFileUtils.openOutputStream(tempFile);
 
           int nRead;
           byte[] data = new byte[32 << 10]; // 32KB
diff --git a/Parse/src/test/java/com/parse/ParseFileControllerTest.java b/Parse/src/test/java/com/parse/ParseFileControllerTest.java
index 76badef88..342c93491 100644
--- a/Parse/src/test/java/com/parse/ParseFileControllerTest.java
+++ b/Parse/src/test/java/com/parse/ParseFileControllerTest.java
@@ -303,7 +303,9 @@ public void testFetchAsyncSuccess() throws Exception {
 
     ParseHttpClient awsClient = mock(ParseHttpClient.class);
     when(awsClient.execute(any(ParseHttpRequest.class))).thenReturn(mockResponse);
-    File root = temporaryFolder.getRoot();
+    // Make sure cache dir does not exist
+    File root = new File(temporaryFolder.getRoot(), "cache");
+    assertFalse(root.exists());
     ParseFileController controller = new ParseFileController(null, root).awsClient(awsClient);
 
     ParseFile.State state = new ParseFile.State.Builder()