diff --git a/Classes/Cache/Listener/SolrIndexingProcessListener.php b/Classes/Cache/Listener/SolrIndexingProcessListener.php
index 99b618c5e3c..664da7798f0 100644
--- a/Classes/Cache/Listener/SolrIndexingProcessListener.php
+++ b/Classes/Cache/Listener/SolrIndexingProcessListener.php
@@ -4,20 +4,16 @@
 
 namespace SFC\Staticfilecache\Cache\Listener;
 
-use SFC\Staticfilecache\Event\CacheRuleFallbackEvent;
+use SFC\Staticfilecache\Event\CacheRuleEventInterface;
 
 /**
  * Solr Indexing process.
  */
 class SolrIndexingProcessListener
 {
-    public function __invoke(CacheRuleFallbackEvent $event): void
+    public function __invoke(CacheRuleEventInterface $event): void
     {
-        // Note!! This is handled by old EXT:solr versions!!!
-        // The new version set the 'frontend.cache.instruction' in the
-        // right way and is cached via CachingAllowedListener.
-
-        if ($event->getRequest()->hasHeader('X-Tx-Solr-Iq')) {
+        if ($event->getRequest()->getAttribute('solr.indexingInstructions', null) !== null) {
             $event->addExplanation(__CLASS__, 'Solr Indexing request');
             $event->setSkipProcessing(true);
         }
diff --git a/Configuration/Services.yaml b/Configuration/Services.yaml
index 388db1ff03c..55623051bbb 100644
--- a/Configuration/Services.yaml
+++ b/Configuration/Services.yaml
@@ -58,6 +58,9 @@ services:
       - name: event.listener
         identifier: 'SolrIndexingProcessListenerFallback'
         event: SFC\Staticfilecache\Event\CacheRuleFallbackEvent
+      - name: event.listener
+        identifier: 'SolrIndexingProcessListener'
+        event: SFC\Staticfilecache\Event\CacheRuleEvent
 
   SFC\Staticfilecache\Cache\Listener\T3CrawlerIndexingProcessListener:
     tags: