diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index f29bf844e..0818dd9fb 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -22,7 +22,7 @@
 
 #include <QDir>
 #include <QFile>
-#include <QRandomGenerator>
+#include <QUuid>
 
 #include "common/filefunctions.h"
 
@@ -30,11 +30,8 @@ OLIVE_NAMESPACE_ENTER
 
 AudioPlaybackCache::AudioPlaybackCache()
 {
-  // FIXME: We just use a randomly generated number, one day this should be matchable to the
-  //        project so it can be reused.
-  quint32 r = QRandomGenerator::global()->generate();
-  filename_ = QDir(FileFunctions::GetMediaCacheLocation()).filePath(QString::number(r));
-  filename_.append(QStringLiteral(".pcm"));
+  quint32 r = std::rand();
+  UpdateFilename(QString::number(r));
 }
 
 void AudioPlaybackCache::SetParameters(const AudioRenderingParams &params)
@@ -137,6 +134,13 @@ void AudioPlaybackCache::WriteSilence(const TimeRange &range)
   }
 }
 
+/*
+void AudioPlaybackCache::SetUuid(const QUuid &id)
+{
+  UpdateFilename(id.toByteArray());
+}
+*/
+
 void AudioPlaybackCache::ShiftEvent(const rational &from, const rational &to)
 {
   qint64 from_offset = params_.time_to_bytes(from);
@@ -236,6 +240,12 @@ QList<TimeRange> AudioPlaybackCache::NoLockGetValidRanges(const TimeRange& range
   return valid_ranges;
 }
 
+void AudioPlaybackCache::UpdateFilename(const QString &s)
+{
+  filename_ = QDir(FileFunctions::GetMediaCacheLocation()).filePath(s);
+  filename_.append(QStringLiteral(".pcm"));
+}
+
 const QString &AudioPlaybackCache::GetCacheFilename() const
 {
   return filename_;
diff --git a/app/render/audioplaybackcache.h b/app/render/audioplaybackcache.h
index b14f465d9..e1305c002 100644
--- a/app/render/audioplaybackcache.h
+++ b/app/render/audioplaybackcache.h
@@ -44,6 +44,8 @@ public:
 
   void WriteSilence(const TimeRange &range);
 
+  //void SetUuid(const QUuid& id);
+
   const QString& GetCacheFilename() const;
 
   QList<TimeRange> GetValidRanges(const TimeRange &range, const qint64 &job_time)
@@ -64,6 +66,8 @@ protected:
 private:
   QList<TimeRange> NoLockGetValidRanges(const TimeRange &range, const qint64 &job_time);
 
+  void UpdateFilename(const QString& s);
+
   QString filename_;
 
   AudioRenderingParams params_;