diff --git a/src/api/mod.rs b/src/api/mod.rs
index 8af4625..d6fb6a7 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -122,3 +122,29 @@ pub trait PgWireHandlerFactory {
 
     fn copy_handler(&self) -> Arc<Self::CopyHandler>;
 }
+
+impl<T> PgWireHandlerFactory for Arc<T>
+where
+    T: PgWireHandlerFactory,
+{
+    type StartupHandler = T::StartupHandler;
+    type SimpleQueryHandler = T::SimpleQueryHandler;
+    type ExtendedQueryHandler = T::ExtendedQueryHandler;
+    type CopyHandler = T::CopyHandler;
+
+    fn simple_query_handler(&self) -> Arc<Self::SimpleQueryHandler> {
+        (**self).simple_query_handler()
+    }
+
+    fn extended_query_handler(&self) -> Arc<Self::ExtendedQueryHandler> {
+        (**self).extended_query_handler()
+    }
+
+    fn startup_handler(&self) -> Arc<Self::StartupHandler> {
+        (**self).startup_handler()
+    }
+
+    fn copy_handler(&self) -> Arc<Self::CopyHandler> {
+        (**self).copy_handler()
+    }
+}
diff --git a/src/tokio.rs b/src/tokio.rs
index 6e7b533..0733139 100644
--- a/src/tokio.rs
+++ b/src/tokio.rs
@@ -359,7 +359,7 @@ fn check_alpn_for_direct_ssl<IO>(tls_socket: &TlsStream<IO>) -> Result<(), IOErr
 pub async fn process_socket<H>(
     tcp_socket: TcpStream,
     tls_acceptor: Option<Arc<TlsAcceptor>>,
-    handlers: Arc<H>,
+    handlers: H,
 ) -> Result<(), IOError>
 where
     H: PgWireHandlerFactory,