diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache
index ec9ac2f6f2e..b35a15f2a74 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-spring-restclient/infrastructure/ApiClient.kt.mustache
@@ -36,9 +36,8 @@ import org.springframework.util.LinkedMultiValueMap
         method(HttpMethod.valueOf(requestConfig.method.name))
 
     private fun <I> RestClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
-        uri { builder ->
+        uri(requestConfig.path) { builder ->
             builder
-                .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))
                 .build(requestConfig.params)
         }
@@ -50,6 +49,7 @@ import org.springframework.util.LinkedMultiValueMap
         when {
             requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
                 val parts = LinkedMultiValueMap<String, Any>()
+                @Suppress("UNCHECKED_CAST")
                 (requestConfig.body as Map<String, PartConfig<*>>).forEach { (name, part) ->
                     if (part.body != null) {
                         parts.add(name, part.body)
diff --git a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 426ad04918f..b1675a9ff64 100644
--- a/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/client/echo_api/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -36,9 +36,8 @@ open class ApiClient(protected val client: RestClient) {
         method(HttpMethod.valueOf(requestConfig.method.name))
 
     private fun <I> RestClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
-        uri { builder ->
+        uri(requestConfig.path) { builder ->
             builder
-                .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))
                 .build(requestConfig.params)
         }
@@ -50,6 +49,7 @@ open class ApiClient(protected val client: RestClient) {
         when {
             requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
                 val parts = LinkedMultiValueMap<String, Any>()
+                @Suppress("UNCHECKED_CAST")
                 (requestConfig.body as Map<String, PartConfig<*>>).forEach { (name, part) ->
                     if (part.body != null) {
                         parts.add(name, part.body)
diff --git a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
index 426ad04918f..b1675a9ff64 100644
--- a/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+++ b/samples/client/petstore/kotlin-jvm-spring-3-restclient/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
@@ -36,9 +36,8 @@ open class ApiClient(protected val client: RestClient) {
         method(HttpMethod.valueOf(requestConfig.method.name))
 
     private fun <I> RestClient.RequestBodyUriSpec.uri(requestConfig: RequestConfig<I>) =
-        uri { builder ->
+        uri(requestConfig.path) { builder ->
             builder
-                .path(requestConfig.path)
                 .queryParams(LinkedMultiValueMap(requestConfig.query))
                 .build(requestConfig.params)
         }
@@ -50,6 +49,7 @@ open class ApiClient(protected val client: RestClient) {
         when {
             requestConfig.headers[HttpHeaders.CONTENT_TYPE] == MediaType.MULTIPART_FORM_DATA_VALUE -> {
                 val parts = LinkedMultiValueMap<String, Any>()
+                @Suppress("UNCHECKED_CAST")
                 (requestConfig.body as Map<String, PartConfig<*>>).forEach { (name, part) ->
                     if (part.body != null) {
                         parts.add(name, part.body)