diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/ContentNegotiatingResultHandlerSupport.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/ContentNegotiatingResultHandlerSupport.java
index 43f4b35a94e..5fd865ab37f 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/ContentNegotiatingResultHandlerSupport.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/ContentNegotiatingResultHandlerSupport.java
@@ -67,7 +67,7 @@ public abstract class ContentNegotiatingResultHandlerSupport implements Ordered
 	/**
 	 * Return the configured {@link ReactiveAdapterRegistry}.
 	 */
-	public ReactiveAdapterRegistry getReactiveAdapterRegistry() {
+	public ReactiveAdapterRegistry getAdapterRegistry() {
 		return this.adapterRegistry;
 	}
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
index 9df7d8cf48e..748e7129603 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
@@ -106,7 +106,7 @@ public abstract class AbstractMessageReaderArgumentResolver {
 	/**
 	 * Return the configured {@link ReactiveAdapterRegistry}.
 	 */
-	public ReactiveAdapterRegistry getReactiveAdapterRegistry() {
+	public ReactiveAdapterRegistry getAdapterRegistry() {
 		return this.adapterRegistry;
 	}
 
@@ -115,7 +115,7 @@ public abstract class AbstractMessageReaderArgumentResolver {
 			ServerWebExchange exchange) {
 
 		Class<?> bodyType = ResolvableType.forMethodParameter(bodyParameter).resolve();
-		ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterTo(bodyType);
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapterTo(bodyType);
 
 		ResolvableType elementType = ResolvableType.forMethodParameter(bodyParameter);
 		if (adapter != null) {
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
index 4869cc4f2e2..5f05bd7ba64 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
@@ -91,7 +91,7 @@ public abstract class AbstractMessageWriterResultHandler extends ContentNegotiat
 	protected Mono<Void> writeBody(Object body, MethodParameter bodyType, ServerWebExchange exchange) {
 
 		Class<?> bodyClass = bodyType.getParameterType();
-		ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(bodyClass, body);
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(bodyClass, body);
 
 		Publisher<?> publisher;
 		ResolvableType elementType;
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
index 81d9b285ac6..ad635480a03 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
@@ -103,8 +103,7 @@ public class ResponseBodyResultHandler extends AbstractMessageWriterResultHandle
 			return true;
 		}
 		else {
-			Optional<Object> optional = result.getReturnValue();
-			ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optional);
+			ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(rawClass, result.getReturnValue());
 			if (adapter != null && !adapter.getDescriptor().isNoValue()) {
 				ResolvableType genericType = result.getReturnType().getGeneric(0);
 				if (HttpEntity.class.isAssignableFrom(genericType.getRawClass())) {
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
index 0a161208824..9f8aace5be9 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
@@ -85,8 +85,7 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
 			return true;
 		}
 		else {
-			Optional<Object> optional = result.getReturnValue();
-			ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(returnType, optional);
+			ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(returnType, result.getReturnValue());
 			if (adapter != null &&
 					!adapter.getDescriptor().isMultiValue() &&
 					!adapter.getDescriptor().isNoValue()) {
@@ -113,7 +112,7 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand
 		Optional<Object> optionalValue = result.getReturnValue();
 
 		Class<?> rawClass = returnType.getRawClass();
-		ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
 
 		if (adapter != null) {
 			returnValueMono = adapter.toMono(optionalValue);
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
index 670825e1eb1..ab6681b1e08 100644
--- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
@@ -143,7 +143,7 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler
 			return true;
 		}
 		Optional<Object> optional = result.getReturnValue();
-		ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(clazz, optional);
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(clazz, optional);
 		if (adapter != null) {
 			if (adapter.getDescriptor().isNoValue()) {
 				return true;
@@ -177,12 +177,11 @@ public class ViewResolutionResultHandler extends ContentNegotiatingResultHandler
 		ResolvableType elementType;
 		ResolvableType returnType = result.getReturnType();
 
-		Class<?> rawClass = returnType.getRawClass();
-		Optional<Object> optionalValue = result.getReturnValue();
-		ReactiveAdapter adapter = getReactiveAdapterRegistry().getAdapterFrom(rawClass, optionalValue);
+		Optional<Object> optional = result.getReturnValue();
+		ReactiveAdapter adapter = getAdapterRegistry().getAdapterFrom(returnType.getRawClass(), optional);
 		if (adapter != null) {
-			if (optionalValue.isPresent()) {
-				Mono<?> converted = adapter.toMono(optionalValue);
+			if (optional.isPresent()) {
+				Mono<?> converted = adapter.toMono(optional);
 				valueMono = converted.map(o -> o);
 			}
 			else {