Wrap partial lookups to override for tracking

lib/liquid/tags/include.rb

@@ -50,11 +50,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
 
-      partial = PartialCache.load(
+      partial = load_partial(template_name, context, parse_context)
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
 
       old_template_name = context.template_name
       old_partial       = context.partial
@@ -113,6 +109,14 @@ module Liquid
     def find_variable(context, *args)
       context.find_variable(*args)
     end
+
+    def load_partial(template_name, context, parse_context)
+      PartialCache.load(
+        template_name,
+        context: context,
+        parse_context: parse_context
+      )
+    end
   end
 
   Template.register_tag('include', Include)

lib/liquid/tags/render.rb

@@ -38,11 +38,7 @@ module Liquid
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name
 
-      partial = PartialCache.load(
+      partial = load_partial(template_name, context, parse_context)
-        template_name,
-        context: context,
-        parse_context: parse_context
-      )
 
       context_variable_name = @alias_name || template_name.split('/').last
 
@@ -84,6 +80,14 @@ module Liquid
     def evaluate(context, value)
       context.evaluate(value)
     end
+
+    def load_partial(template_name, context, parse_context)
+      PartialCache.load(
+        template_name,
+        context: context,
+        parse_context: parse_context
+      )
+    end
   end
 
   Template.register_tag('render', Render)