diff --git a/spring-cloud-gateway-mvc/pom.xml b/spring-cloud-gateway-mvc/pom.xml
index deafa89c..06f8111b 100644
--- a/spring-cloud-gateway-mvc/pom.xml
+++ b/spring-cloud-gateway-mvc/pom.xml
@@ -24,6 +24,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java
index a07626fe..232def71 100644
--- a/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java
+++ b/spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java
@@ -66,7 +66,6 @@ import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.method.support.ModelAndViewContainer;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor;
-import org.springframework.web.util.DefaultUriBuilderFactory;
 
 /**
  * A <code>@RequestMapping</code> argument type that can proxy the request to a backend.
@@ -464,9 +463,7 @@ public class ProxyExchange<T> {
 		NestedTemplate rest = new NestedTemplate();
 		rest.setMessageConverters(input.getMessageConverters());
 		rest.setErrorHandler(input.getErrorHandler());
-		rest.setDefaultUriVariables(
-				((DefaultUriBuilderFactory) input.getUriTemplateHandler())
-						.getDefaultUriVariables());
+		rest.setUriTemplateHandler(input.getUriTemplateHandler());
 		rest.setRequestFactory(input.getRequestFactory());
 		rest.setInterceptors(input.getInterceptors());
 		return rest;