          (let [subscriptions (inputs-fn query-vec)
                reaction-id   (atom nil)
                reaction      (make-reaction
-                               (fn [] (trace/with-trace {:operation (first-in-vector query-vec)
-                                                         :op-type   :sub/run
-                                                         :tags      {:query-v  query-vec
-                                                                     :reaction @reaction-id}}
-                                        (computation-fn (deref-input-signals subscriptions query-id) query-vec))))]
+                               (fn []
+                                 (let [sub-value (computation-fn (deref-input-signals subscriptions query-id) query-vec)]
+                                   (trace/with-trace {:operation (first-in-vector query-vec)
+                                                      :op-type   :sub/run
+                                                      :tags      {:sub-value  sub-value
+                                                                  :query-v    query-vec
+                                                                  :reaction   @reaction-id}}
+                                                     sub-value))))]
+
            (reset! reaction-id (reagent-id reaction))
            reaction))
         ([db query-vec dyn-vec]

               reaction-id   (atom nil)
               reaction      (make-reaction
                               (fn []
                                 (trace/with-trace {:operation (first-in-vector query-vec)
                                                    :op-type   :sub/run
                                                    :tags      {:query-v  query-vec
                                                                :dyn-v    dyn-vec
                                                                :reaction @reaction-id}}
                                   (computation-fn (deref-input-signals subscriptions query-id) query-vec dyn-vec))))]
           (reset! reaction-id (reagent-id reaction))
           reaction))))))

     (if-let [cached (cache-lookup query)]
       (do
         (trace/merge-trace! {:tags {:cached?  true
                                     :sub-value (deref cached)
                                     :reaction (reagent-id cached)}})
         cached)

