diff --git a/src/main/java/com/gotocompany/firehose/sink/blob/writer/WriterOrchestrator.java b/src/main/java/com/gotocompany/firehose/sink/blob/writer/WriterOrchestrator.java
index 54c4c7d06..b41bfce13 100644
--- a/src/main/java/com/gotocompany/firehose/sink/blob/writer/WriterOrchestrator.java
+++ b/src/main/java/com/gotocompany/firehose/sink/blob/writer/WriterOrchestrator.java
@@ -139,7 +139,7 @@ public void close() throws IOException {
             writer.close();
         }
         for (LocalFileWriter p : timePartitionWriterMap.values()) {
-            localStorage.deleteLocalFile(p.getMetadata().getFullPath());
+            localStorage.deleteLocalFile(p.getFullPath());
         }
     }
 }
diff --git a/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalFileWriter.java b/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalFileWriter.java
index 1c8f3cd0b..2b86bbc0d 100644
--- a/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalFileWriter.java
+++ b/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalFileWriter.java
@@ -16,4 +16,6 @@ public interface LocalFileWriter extends Closeable {
     LocalFileMetadata getMetadata();
 
     LocalFileMetadata closeAndFetchMetaData() throws IOException;
+
+    String getFullPath();
 }
diff --git a/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalParquetFileWriter.java b/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalParquetFileWriter.java
index 2a8cb9422..11ad9552d 100644
--- a/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalParquetFileWriter.java
+++ b/src/main/java/com/gotocompany/firehose/sink/blob/writer/local/LocalParquetFileWriter.java
@@ -70,4 +70,9 @@ public synchronized LocalFileMetadata closeAndFetchMetaData() throws IOException
         this.close();
         return metadata;
     }
+
+    @Override
+    public String getFullPath() {
+        return fullPath;
+    }
 }