diff --git a/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs b/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
index 053a37b..90794c6 100644
--- a/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
+++ b/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
@@ -80,8 +80,11 @@
                     "Cannot read from null inputstream");
             }
 
-            // The ReadAsync method should not be used since it does not check the ReceiveTimeout property.
-            return await Task.Run( () => InputStream.Read( buffer, offset, length ), cancellationToken );
+#if NETSTANDARD2_0
+            return await InputStream.ReadAsync(buffer, offset, length, cancellationToken);
+#else
+            return await InputStream.ReadAsync(new Memory<byte>(buffer, offset, length), cancellationToken);
+#endif
         }
 
         public override async Task WriteAsync(byte[] buffer, int offset, int length, CancellationToken cancellationToken)
@@ -92,8 +95,11 @@
                     "Cannot write to null outputstream");
             }
 
-            // The WriteAsync method should not be used since it does not check the SendTimeout property.
-            await Task.Run( () => OutputStream.Write( buffer, offset, length ), cancellationToken );
+#if NETSTANDARD2_0
+            await OutputStream.WriteAsync(buffer, offset, length, cancellationToken);
+#else
+            await OutputStream.WriteAsync(buffer.AsMemory(offset, length), cancellationToken);
+#endif
         }
 
         public override async Task FlushAsync(CancellationToken cancellationToken)