Add custom Block class that adds layout-name to cache key info

Author: jissereitsma

Block/LokiScript.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Loki\Base\Block;
+
+use Magento\Framework\View\Element\Template;
+
+class LokiScript extends Template
+{
+    public function getCacheKeyInfo(): array
+    {
+        return [
+            ...parent::getCacheKeyInfo(),
+            $this->getNameInLayout(),
+        ];
+    }
+}

view/base/layout/loki_base.xml

@@ -18,7 +18,10 @@
                 </block>
             </container>
 
-            <block name="loki.script" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>
@@ -32,7 +35,10 @@
                 </block>
             </block>
 
-            <block name="loki.script.store" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script.store"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>
@@ -46,27 +52,39 @@
                 <block name="loki.script.store.messages" template="Loki_Base::script/store/message-store.phtml"/>
             </block>
 
-            <block name="loki.script.directive" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script.directive"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>
 
                 <block name="loki.script.directive.autoremove" template="Loki_Base::script/directive/autoremove-directive.phtml"/>
             </block>
 
-            <block name="loki.script.component-partial" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script.component-partial"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>
             </block>
 
-            <block name="loki.script.component-type" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script.component-type"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>
             </block>
 
-            <block name="loki.script.component" template="Loki_Base::script/script-container.phtml">
+            <block
+                name="loki.script.component"
+                class="Loki\Base\Block\LokiScript"
+                template="Loki_Base::script/script-container.phtml">
                 <arguments>
                     <argument name="cache_lifetime" xsi:type="number">86400</argument>
                 </arguments>