diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index 83a41d396..9f694723f 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -163,7 +163,7 @@ void ExportTask::FrameDownloaded(FramePtr f, const QByteArray &hash, const QVect
 
   forever {
     rational real_time = Timecode::timestamp_to_time(frame_time_,
-                                                     viewer()->GetVideoParams().frame_rate_as_time_base());
+                                                     video_params().frame_rate_as_time_base());
 
     if (!time_map_.contains(real_time)) {
       break;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 9f327b217..da5336024 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -76,7 +76,7 @@ bool RenderTask::Render(ColorManager* manager,
 
   if (!video_range.isEmpty()) {
     // Get list of discrete frames from range
-    QVector<rational> times = viewer()->video_frame_cache()->GetFrameListFromTimeRange(video_range);
+    QVector<rational> times = FrameHashCache::GetFrameListFromTimeRange(video_range, video_params().frame_rate_as_time_base());
     QVector<QByteArray> hashes(times.size());
 
     // Generate hashes