diff --git a/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java b/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
index 3f47e3e..893be36 100644
--- a/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
+++ b/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
@@ -37,6 +37,7 @@
 import java.io.RandomAccessFile;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -478,7 +479,7 @@
 
                 try {
                     // Attempt to create a temporary file.
-                    tempFile = File.createTempFile("jai-SOS-", ".tmp");
+                    tempFile = Files.createTempFile("jai-SOS-", ".tmp").toFile();
                     tempFile.deleteOnExit();
                     RandomAccessFile raFile = new RandomAccessFile(tempFile, "rw");
                     output = new SeekableOutputStream(raFile);
diff --git a/src/main/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java b/src/main/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java
index 66dd303..8e7dbfa 100644
--- a/src/main/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java
+++ b/src/main/java/org/apache/xmlgraphics/image/codec/util/FileCacheSeekableStream.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.nio.file.Files;
 
 /**
  * A subclass of <code>SeekableStream</code> that may be used to wrap
@@ -75,7 +76,7 @@
     public FileCacheSeekableStream(InputStream stream)
         throws IOException {
         this.stream = stream;
-        this.cacheFile = File.createTempFile("jai-FCSS-", ".tmp");
+        this.cacheFile = Files.createTempFile("jai-FCSS-", ".tmp").toFile();
         cacheFile.deleteOnExit();
         this.cache = new RandomAccessFile(cacheFile, "rw");
     }
