diff --git a/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs b/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
index f70bf8550..6af79368a 100644
--- a/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
+++ b/Titanium.Web.Proxy/EventArguments/SessionEventArgs.cs
@@ -522,6 +522,7 @@ public async Task Respond(Response response)
         /// </summary>
         public void Dispose()
         {
+            WebSession.Dispose();
         }
     }
 }
diff --git a/Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs b/Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs
index 6d10c3d91..32bce44f2 100644
--- a/Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs
+++ b/Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -18,10 +19,15 @@ internal class CustomBinaryReader : IDisposable
         private readonly byte[] staticBuffer;
         private readonly Encoding encoding;
 
+        private static readonly ConcurrentQueue<byte[]> buffers = new ConcurrentQueue<byte[]>();
+
         internal CustomBinaryReader(CustomBufferedStream stream, int bufferSize)
         {
             this.stream = stream;
-            staticBuffer = new byte[bufferSize];
+            if (!buffers.TryDequeue(out staticBuffer) || staticBuffer.Length != bufferSize)
+            {
+                staticBuffer = new byte[bufferSize];
+            }
 
             this.bufferSize = bufferSize;
 
@@ -148,6 +154,7 @@ internal async Task<byte[]> ReadBytesAsync(long totalBytesToRead)
 
         public void Dispose()
         {
+            buffers.Enqueue(staticBuffer);
         }
 
         private void ResizeBuffer(ref byte[] buffer, long size)
diff --git a/Titanium.Web.Proxy/Http/HttpWebClient.cs b/Titanium.Web.Proxy/Http/HttpWebClient.cs
index 46aa379c7..03bb2ae80 100644
--- a/Titanium.Web.Proxy/Http/HttpWebClient.cs
+++ b/Titanium.Web.Proxy/Http/HttpWebClient.cs
@@ -11,7 +11,7 @@ namespace Titanium.Web.Proxy.Http
     /// <summary>
     /// Used to communicate with the server over HTTP(S)
     /// </summary>
-    public class HttpWebClient
+    public class HttpWebClient : IDisposable
     {
         /// <summary>
         /// Connection to server
@@ -208,5 +208,12 @@ internal async Task ReceiveResponse()
             //Read the response headers in to unique and non-unique header collections
             await HeaderParser.ReadHeaders(ServerConnection.StreamReader, Response.NonUniqueResponseHeaders, Response.ResponseHeaders);
         }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+        }
     }
 }
diff --git a/Titanium.Web.Proxy/RequestHandler.cs b/Titanium.Web.Proxy/RequestHandler.cs
index 624c71546..fbd18d823 100644
--- a/Titanium.Web.Proxy/RequestHandler.cs
+++ b/Titanium.Web.Proxy/RequestHandler.cs
@@ -44,7 +44,6 @@ private async Task HandleClient(ExplicitProxyEndPoint endPoint, TcpClient tcpCli
 
                 if (string.IsNullOrEmpty(httpCmd))
                 {
-                    Dispose(clientStream, clientStreamReader, clientStreamWriter, null);
                     return;
                 }
 
@@ -99,7 +98,6 @@ private async Task HandleClient(ExplicitProxyEndPoint endPoint, TcpClient tcpCli
 
                     if (await CheckAuthorization(clientStreamWriter, connectRequestHeaders) == false)
                     {
-                        Dispose(clientStream, clientStreamReader, clientStreamWriter, null);
                         return;
                     }
 
@@ -111,7 +109,8 @@ private async Task HandleClient(ExplicitProxyEndPoint endPoint, TcpClient tcpCli
                     {
                         sslStream = new SslStream(clientStream, true);
 
-                        var certificate = endPoint.GenericCertificate ?? CertificateManager.CreateCertificate(httpRemoteUri.Host, false);
+                        var certificate = endPoint.GenericCertificate ??
+                                          CertificateManager.CreateCertificate(httpRemoteUri.Host, false);
 
                         //Successfully managed to authenticate the client using the fake certificate
                         await sslStream.AuthenticateAsServerAsync(certificate, false,
@@ -119,14 +118,13 @@ await sslStream.AuthenticateAsServerAsync(certificate, false,
                         //HTTPS server created - we can now decrypt the client's traffic
                         clientStream = new CustomBufferedStream(sslStream, BufferSize);
 
+                        clientStreamReader.Dispose();
                         clientStreamReader = new CustomBinaryReader(clientStream, BufferSize);
-                        clientStreamWriter = new StreamWriter(clientStream) { NewLine = ProxyConstants.NewLine };
+                        clientStreamWriter = new StreamWriter(clientStream) {NewLine = ProxyConstants.NewLine};
                     }
                     catch
                     {
                         sslStream?.Dispose();
-
-                        Dispose(clientStream, clientStreamReader, clientStreamWriter, null);
                         return;
                     }
 
@@ -141,24 +139,25 @@ await sslStream.AuthenticateAsServerAsync(certificate, false,
                     //write back successfull CONNECT response
                     await WriteConnectResponse(clientStreamWriter, version);
 
-                    await TcpHelper.SendRaw(this, 
+                    await TcpHelper.SendRaw(this,
                         httpRemoteUri.Host, httpRemoteUri.Port,
                         null, version, null,
-                        false, 
+                        false,
                         clientStream, tcpConnectionFactory);
 
-                    Dispose(clientStream, clientStreamReader, clientStreamWriter, null);
                     return;
                 }
                 //Now create the request
                 await HandleHttpSessionRequest(tcpClient, httpCmd, clientStream, clientStreamReader, clientStreamWriter,
-                    httpRemoteUri.Scheme == Uri.UriSchemeHttps ? httpRemoteUri.Host : null, endPoint, connectRequestHeaders);
+                    httpRemoteUri.Scheme == Uri.UriSchemeHttps ? httpRemoteUri.Host : null, endPoint,
+                    connectRequestHeaders);
             }
             catch (Exception)
             {
-                Dispose(clientStream,
-                    clientStreamReader,
-                    clientStreamWriter, null);
+            }
+            finally
+            {
+                Dispose(clientStream, clientStreamReader, clientStreamWriter, null);
             }
         }
 
@@ -544,7 +543,6 @@ await TcpHelper.SendRaw(this,
                     break;
                 }
             }
-
         }
 
         /// <summary>