lib/jbuilder/jbuilder_template.rb in jbuilder-2.0.0.beta vs lib/jbuilder/jbuilder_template.rb in jbuilder-2.0.0.beta2

@@ -52,10 +52,10 @@
     if @context.controller.perform_caching
       value = ::Rails.cache.fetch(_cache_key(key), options) do
         _scope { yield self }
       end
 
-      _merge(value)
+      merge! value
     else
       yield
     end
   end