diff --git a/src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs b/src/csharp/Grpc.Core.Api/Interceptors/CallInvokerExtensions.cs
similarity index 100%
rename from src/csharp/Grpc.Core/Interceptors/CallInvokerExtensions.cs
rename to src/csharp/Grpc.Core.Api/Interceptors/CallInvokerExtensions.cs
diff --git a/src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs b/src/csharp/Grpc.Core.Api/Interceptors/InterceptingCallInvoker.cs
similarity index 100%
rename from src/csharp/Grpc.Core/Interceptors/InterceptingCallInvoker.cs
rename to src/csharp/Grpc.Core.Api/Interceptors/InterceptingCallInvoker.cs
diff --git a/src/csharp/Grpc.Core/ForwardedTypes.cs b/src/csharp/Grpc.Core/ForwardedTypes.cs
index ab5f5a87c67..fb99cfc018d 100644
--- a/src/csharp/Grpc.Core/ForwardedTypes.cs
+++ b/src/csharp/Grpc.Core/ForwardedTypes.cs
@@ -36,6 +36,7 @@ using Grpc.Core.Utils;
 [assembly:TypeForwardedToAttribute(typeof(CallCredentials))]
 [assembly:TypeForwardedToAttribute(typeof(CallFlags))]
 [assembly:TypeForwardedToAttribute(typeof(CallInvoker))]
+[assembly:TypeForwardedToAttribute(typeof(CallInvokerExtensions))]
 [assembly:TypeForwardedToAttribute(typeof(CallOptions))]
 [assembly:TypeForwardedToAttribute(typeof(ClientInterceptorContext<,>))]
 [assembly:TypeForwardedToAttribute(typeof(ContextPropagationOptions))]
@@ -45,6 +46,7 @@ using Grpc.Core.Utils;
 [assembly:TypeForwardedToAttribute(typeof(IAsyncStreamWriter<>))]
 [assembly:TypeForwardedToAttribute(typeof(IClientStreamWriter<>))]
 [assembly:TypeForwardedToAttribute(typeof(Interceptor))]
+[assembly:TypeForwardedToAttribute(typeof(InterceptingCallInvoker))]
 [assembly:TypeForwardedToAttribute(typeof(IServerStreamWriter<>))]
 [assembly:TypeForwardedToAttribute(typeof(Marshaller<>))]
 [assembly:TypeForwardedToAttribute(typeof(Marshallers))]