diff --git a/pom.xml b/pom.xml
index 1b455d61a..a7f346d69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-engine</artifactId>
     <packaging>jar</packaging>
-    <version>6.5.4</version>
+    <version>6.5.4-fix.1</version>
     <name>Entando Core: Engine</name>
     <description>Entando Engine: an agile, modern and user-centric open source Portal platform.</description>
     <url>http://www.entando.com/</url>
diff --git a/src/main/java/org/entando/entando/aps/system/services/cache/IFCacheWithPipeline.java b/src/main/java/org/entando/entando/aps/system/services/cache/IFCacheWithPipeline.java
index 66fe2d5f4..0ff69a6e9 100644
--- a/src/main/java/org/entando/entando/aps/system/services/cache/IFCacheWithPipeline.java
+++ b/src/main/java/org/entando/entando/aps/system/services/cache/IFCacheWithPipeline.java
@@ -52,10 +52,10 @@ static void pipelined(Object cache, Consumer<IFCacheWithPipeline> pipelinedBlock
                 openPipeline(cache);
                 pipelinedBlock.accept((IFCacheWithPipeline) cache);
                 closePipeline(cache);
+                return;
             }
-        } else {
-            pipelinedBlock.accept(null);
         }
+        pipelinedBlock.accept(null);
     }
 
     default boolean isEnabled() {