diff --git a/src/KubernetesClient.Classic/Global.cs b/src/KubernetesClient.Classic/Global.cs
index f96593e4a..70b3700e1 100644
--- a/src/KubernetesClient.Classic/Global.cs
+++ b/src/KubernetesClient.Classic/Global.cs
@@ -2,3 +2,4 @@
 global using System.Collections.Generic;
 global using System.Linq;
 global using System.Text.Json;
+global using System.Text.Json.Serialization;
diff --git a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
index 240ebbf0b..47a926b45 100644
--- a/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
+++ b/src/KubernetesClient.Classic/KubernetesClient.Classic.csproj
@@ -9,6 +9,7 @@
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.1" />
     <PackageReference Include="IdentityModel.OidcClient" Version="5.2.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
   </ItemGroup>
     
   <ItemGroup>
@@ -42,6 +43,10 @@
     <Compile Include="..\KubernetesClient\IKubernetes.Exec.cs" />
     <Compile Include="..\KubernetesClient\Kubernetes.Exec.cs" />
 
+    <Compile Include="..\KubernetesClient\Watcher.cs" />
+    <Compile Include="..\KubernetesClient\WatcherExt.cs" />
+    <Compile Include="..\KubernetesClient\LineSeparatedHttpContent.cs" />
+
     <Compile Include="..\KubernetesClient\Exceptions\KubeConfigException.cs" />
     <Compile Include="..\KubernetesClient\Exceptions\KubernetesClientException.cs" />
 
diff --git a/src/KubernetesClient/Kubernetes.cs b/src/KubernetesClient/Kubernetes.cs
index 75bedae8e..a100a23ff 100644
--- a/src/KubernetesClient/Kubernetes.cs
+++ b/src/KubernetesClient/Kubernetes.cs
@@ -76,11 +76,7 @@ protected override async Task<HttpOperationResponse<T>> CreateResultAsync<T>(Htt
 
             if (watch == true)
             {
-#if NETSTANDARD2_0 || NET48
-                throw new KubernetesException("watch not supported");
-#else
                 httpResponse.Content = new LineSeparatedHttpContent(httpResponse.Content, cancellationToken);
-#endif
             }
 
             try