diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f472c78938..baeee51db2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ kotlin = "2.2.21"
 kotlinpoet = "2.2.0"
 ktlint = "0.48.2"
 moshi = "1.15.2"
-okhttp = "5.2.1"
+okhttp = "5.3.1"
 okio = "3.9.1"
 protobuf = "4.33.1"
 protobufGradlePlugin = "0.9.5"
diff --git a/wire-grpc-mockwebserver/api/wire-grpc-mockwebserver.api b/wire-grpc-mockwebserver/api/wire-grpc-mockwebserver.api
index 5bf22ab961..58929f62a5 100644
--- a/wire-grpc-mockwebserver/api/wire-grpc-mockwebserver.api
+++ b/wire-grpc-mockwebserver/api/wire-grpc-mockwebserver.api
@@ -25,6 +25,14 @@ public final class com/squareup/wire/mockwebserver/GrpcDispatcher$Companion$Null
 	public synthetic fun isExecuted ()Z
 	public fun request ()Ljava/lang/Void;
 	public synthetic fun request ()Lokhttp3/Request;
+	public synthetic fun tag (Ljava/lang/Class;)Ljava/lang/Object;
+	public fun tag (Ljava/lang/Class;)Ljava/lang/Void;
+	public synthetic fun tag (Ljava/lang/Class;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public fun tag (Ljava/lang/Class;Lkotlin/jvm/functions/Function0;)Ljava/lang/Void;
+	public synthetic fun tag (Lkotlin/reflect/KClass;)Ljava/lang/Object;
+	public fun tag (Lkotlin/reflect/KClass;)Ljava/lang/Void;
+	public synthetic fun tag (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public fun tag (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function0;)Ljava/lang/Void;
 	public fun timeout ()Lokio/Timeout;
 }
 
diff --git a/wire-grpc-mockwebserver/src/main/java/com/squareup/wire/mockwebserver/GrpcDispatcher.kt b/wire-grpc-mockwebserver/src/main/java/com/squareup/wire/mockwebserver/GrpcDispatcher.kt
index 9686c0c419..bfa332977c 100644
--- a/wire-grpc-mockwebserver/src/main/java/com/squareup/wire/mockwebserver/GrpcDispatcher.kt
+++ b/wire-grpc-mockwebserver/src/main/java/com/squareup/wire/mockwebserver/GrpcDispatcher.kt
@@ -30,6 +30,7 @@ import com.squareup.wire.Service
 import com.squareup.wire.internal.GrpcMessageSink
 import com.squareup.wire.internal.GrpcMessageSource
 import java.lang.reflect.Method
+import kotlin.reflect.KClass
 import okhttp3.Call
 import okhttp3.Callback
 import okhttp3.Headers.Companion.headersOf
@@ -204,6 +205,10 @@ class GrpcDispatcher(
       override fun isExecuted() = error("unexpected call")
       override fun request() = error("unexpected call")
       override fun timeout() = Timeout.NONE
+      override fun <T : Any> tag(type: KClass<T>) = error("unexpected call")
+      override fun <T> tag(type: Class<out T>) = error("unexpected call")
+      override fun <T : Any> tag(type: KClass<T>, computeIfAbsent: () -> T) = error("unexpected call")
+      override fun <T : Any> tag(type: Class<T>, computeIfAbsent: () -> T) = error("unexpected call")
     }
 
     /**