diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index 7dcc73168..b63632f30 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -387,7 +387,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 		 * It is not intended to remain here and will be removed as soon as particular elements
 		 * of stream will be refactored to address this.
 		 */
-		private Function<Object, Message> enhancer;
+		private Function<Object, Object> enhancer;
 
 		FunctionInvocationWrapper(FunctionInvocationWrapper function) {
 			this.skipOutputConversion = function.skipOutputConversion;
@@ -432,7 +432,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 		 * It is not intended to remain here and will be removed as soon as particular elements
 		 * of stream will be refactored to address this.
 		 */
-		public Function<Object, Message> getEnhancer() {
+		public Function<Object, Object> getEnhancer() {
 			return this.enhancer;
 		}
 
@@ -443,7 +443,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 		 * It is not intended to remain here and will be removed as soon as particular elements
 		 * of stream will be refactored to address this.
 		 */
-		public void setEnhancer(Function<Object, Message> enhancer) {
+		public void setEnhancer(Function<Object, Object> enhancer) {
 			this.enhancer = enhancer;
 		}