diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
index 6182ef011bd..92173c866ef 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
@@ -274,6 +274,7 @@ public static void rebaseResponse(EndpointReferenceType reference,
                         DelegatingInputStream in = inMessage.getContent(DelegatingInputStream.class);
                         if (in != null) {
                             in.cacheInput();
+                            inMessage.put("cxf.io.cacheinput", Boolean.TRUE);
                         }
                     }
                     if (chain != null && !chain.doIntercept(partialResponse)