diff --git a/src/FrameMapper.cpp b/src/FrameMapper.cpp
index ca2038a9..113171a2 100644
--- a/src/FrameMapper.cpp
+++ b/src/FrameMapper.cpp
@@ -651,6 +651,16 @@ void FrameMapper::Close()
 		// Close internal reader
 		reader->Close();
 
+		// Clear the fields & frames lists
+		fields.clear();
+		frames.clear();
+
+		// Mark as dirty
+		is_dirty = true;
+
+		// Clear cache
+		final_cache.Clear();
+
 		// Deallocate resample buffer
 		if (avr) {
 			SWR_CLOSE(avr);