diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp
index 9a0fb034d..cf04d8e72 100644
--- a/app/node/traverser.cpp
+++ b/app/node/traverser.cpp
@@ -292,6 +292,83 @@ QVector2D NodeTraverser::GenerateResolution() const
   return QVector2D(video_params_.square_pixel_width(), video_params_.height());
 }
 
+void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
+{
+  if (val.type() == NodeValue::kTexture || val.type() == NodeValue::kSamples) {
+    const QVariant &v = val.data();
+
+    if (v.canConvert<ShaderJob>()) {
+
+      ShaderJob job = v.value<ShaderJob>();
+
+      VideoParams tex_params = GetCacheVideoParams();
+      tex_params.set_channel_count(GetChannelCountFromJob(job));
+
+      TexturePtr tex = CreateTexture(tex_params);
+
+      ProcessShader(tex, val.source(), range, job);
+
+      val.set_data(QVariant::fromValue(tex));
+
+    } else if (v.canConvert<GenerateJob>()) {
+
+      GenerateJob job = v.value<GenerateJob>();
+
+      VideoParams tex_params = GetCacheVideoParams();
+      tex_params.set_channel_count(GetChannelCountFromJob(job));
+      if (job.GetRequestedFormat() != VideoParams::kFormatInvalid) {
+        tex_params.set_format(job.GetRequestedFormat());
+      }
+
+      TexturePtr tex = CreateTexture(tex_params);
+
+      ProcessFrameGeneration(tex, val.source(), job);
+
+      val.set_data(QVariant::fromValue(tex));
+
+    } else if (v.canConvert<FootageJob>()) {
+
+      FootageJob job = v.value<FootageJob>();
+
+      if (job.type() == Track::kVideo) {
+
+        rational footage_time = Footage::AdjustTimeByLoopMode(range.in(), job.loop_mode(), job.length(), job.video_params().video_type(), job.video_params().frame_rate_as_time_base());
+
+        TexturePtr tex;
+
+        if (footage_time.isNaN()) {
+          // Push dummy texture
+          tex = CreateDummyTexture(job.video_params());
+        } else {
+          VideoParams managed_params = job.video_params();
+          managed_params.set_format(GetCacheVideoParams().format());
+
+          tex = CreateTexture(job.video_params());
+          ProcessVideoFootage(tex, job, footage_time);
+        }
+
+        val.set_data(QVariant::fromValue(tex));
+
+      } else if (job.type() == Track::kAudio) {
+
+        SampleBufferPtr buffer = CreateSampleBuffer(GetCacheAudioParams(), range.length());
+        ProcessAudioFootage(buffer, job, range);
+        val.set_data(QVariant::fromValue(buffer));
+
+      }
+
+    } else if (v.canConvert<SampleJob>()) {
+
+      SampleJob job = v.value<SampleJob>();
+      SampleBufferPtr output_buffer = CreateSampleBuffer(job.samples()->audio_params(), job.samples()->sample_count());
+      ProcessSamples(output_buffer, val.source(), range, job);
+      val.set_data(QVariant::fromValue(output_buffer));
+
+    }
+
+  }
+}
+
 void NodeTraverser::PreProcessRow(const TimeRange &range, NodeValueRow &row)
 {
   QByteArray cached_node_hash;
@@ -301,79 +378,7 @@ void NodeTraverser::PreProcessRow(const TimeRange &range, NodeValueRow &row)
     // Jobs will almost always be submitted with one of these types
     NodeValue &val = it.value();
 
-    if (val.type() == NodeValue::kTexture || val.type() == NodeValue::kSamples) {
-      const QVariant &v = val.data();
-
-      if (v.canConvert<ShaderJob>()) {
-
-        ShaderJob job = v.value<ShaderJob>();
-
-        VideoParams tex_params = GetCacheVideoParams();
-        tex_params.set_channel_count(GetChannelCountFromJob(job));
-
-        TexturePtr tex = CreateTexture(tex_params);
-
-        ProcessShader(tex, val.source(), range, job);
-
-        val.set_data(QVariant::fromValue(tex));
-
-      } else if (v.canConvert<GenerateJob>()) {
-
-        GenerateJob job = v.value<GenerateJob>();
-
-        VideoParams tex_params = GetCacheVideoParams();
-        tex_params.set_channel_count(GetChannelCountFromJob(job));
-        if (job.GetRequestedFormat() != VideoParams::kFormatInvalid) {
-          tex_params.set_format(job.GetRequestedFormat());
-        }
-
-        TexturePtr tex = CreateTexture(tex_params);
-
-        ProcessFrameGeneration(tex, val.source(), job);
-
-        val.set_data(QVariant::fromValue(tex));
-
-      } else if (v.canConvert<FootageJob>()) {
-
-        FootageJob job = v.value<FootageJob>();
-
-        if (job.type() == Track::kVideo) {
-
-          rational footage_time = Footage::AdjustTimeByLoopMode(range.in(), job.loop_mode(), job.length(), job.video_params().video_type(), job.video_params().frame_rate_as_time_base());
-
-          TexturePtr tex;
-
-          if (footage_time.isNaN()) {
-            // Push dummy texture
-            tex = CreateDummyTexture(job.video_params());
-          } else {
-            VideoParams managed_params = job.video_params();
-            managed_params.set_format(GetCacheVideoParams().format());
-
-            tex = CreateTexture(job.video_params());
-            ProcessVideoFootage(tex, job, footage_time);
-          }
-
-          val.set_data(QVariant::fromValue(tex));
-
-        } else if (job.type() == Track::kAudio) {
-
-          SampleBufferPtr buffer = CreateSampleBuffer(GetCacheAudioParams(), range.length());
-          ProcessAudioFootage(buffer, job, range);
-          val.set_data(QVariant::fromValue(buffer));
-
-        }
-
-      } else if (v.canConvert<SampleJob>()) {
-
-        SampleJob job = v.value<SampleJob>();
-        SampleBufferPtr output_buffer = CreateSampleBuffer(job.samples()->audio_params(), job.samples()->sample_count());
-        ProcessSamples(output_buffer, val.source(), range, job);
-        val.set_data(QVariant::fromValue(output_buffer));
-
-      }
-
-    }
+    ResolveJobs(val, range);
   }
 }
 
diff --git a/app/node/traverser.h b/app/node/traverser.h
index 21cba7c1d..9a48916a7 100644
--- a/app/node/traverser.h
+++ b/app/node/traverser.h
@@ -130,6 +130,8 @@ protected:
     cancel_ = cancel;
   }
 
+  void ResolveJobs(NodeValue &value, const TimeRange &range);
+
 private:
   void PreProcessRow(const TimeRange &range, NodeValueRow &row);
 
diff --git a/app/render/renderprocessor.cpp b/app/render/renderprocessor.cpp
index 1d04c6771..8b7dbb0e7 100644
--- a/app/render/renderprocessor.cpp
+++ b/app/render/renderprocessor.cpp
@@ -50,12 +50,18 @@ TexturePtr RenderProcessor::GenerateTexture(const rational &time, const rational
 {
   ViewerOutput* viewer = Node::ValueToPtr<ViewerOutput>(ticket_->property("viewer"));
 
+  TimeRange range = TimeRange(time, time + frame_length);
+
   NodeValueTable table;
   if (Node *texture_output = viewer->GetConnectedTextureOutput()) {
-    table = GenerateTable(texture_output, viewer->GetValueHintForInput(ViewerOutput::kTextureInput), TimeRange(time, time + frame_length));
+    table = GenerateTable(texture_output, viewer->GetValueHintForInput(ViewerOutput::kTextureInput), range);
   }
 
-  return table.Get(NodeValue::kTexture).value<TexturePtr>();
+  NodeValue tex_val = table.GetWithMeta(NodeValue::kTexture);
+
+  ResolveJobs(tex_val, range);
+
+  return tex_val.data().value<TexturePtr>();
 }
 
 FramePtr RenderProcessor::GenerateFrame(TexturePtr texture, const rational& time)