diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyCallableStatement.java b/src/main/java/com/zaxxer/hikari/pool/ProxyCallableStatement.java
index 922be53c..9cc662a5 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyCallableStatement.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyCallableStatement.java
@@ -19,7 +19,7 @@ package com.zaxxer.hikari.pool;
 import java.sql.CallableStatement;
 
 /**
- * This is the proxy class for java.sql.CallableStatement.
+ * This is the proxy class for {@link CallableStatement}.
  *
  * @author Brett Wooldridge
  */
@@ -34,4 +34,4 @@ public abstract class ProxyCallableStatement extends ProxyPreparedStatement impl
    //               Overridden java.sql.CallableStatement Methods
    // **********************************************************************
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
index 93508904..16725992 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
@@ -30,7 +30,7 @@ import java.util.concurrent.Executor;
 import static com.zaxxer.hikari.SQLExceptionOverride.Override.DO_NOT_EVICT;
 
 /**
- * This is the proxy class for java.sql.Connection.
+ * This is the proxy class for {@link Connection}.
  *
  * @author Brett Wooldridge
  */
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java b/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java
index 6cb4819a..a54c2ae2 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java
@@ -5,6 +5,12 @@ import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+/**
+ * This is the proxy class for {@link DatabaseMetaData}.
+ *
+ * @author Brett Wooldridge
+ * @author Yanming Zhou
+ */
 public abstract class ProxyDatabaseMetaData implements DatabaseMetaData
 {
    protected final ProxyConnection connection;
@@ -302,6 +308,13 @@ public abstract class ProxyDatabaseMetaData implements DatabaseMetaData
       return ProxyFactory.getProxyResultSet(connection, (ProxyStatement) statement, resultSet);
    }
 
+   /** {@inheritDoc} */
+   @Override
+   public final boolean isWrapperFor(Class<?> iface) throws SQLException
+   {
+      return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+   }
+
    /** {@inheritDoc} */
    @Override
    @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyPreparedStatement.java b/src/main/java/com/zaxxer/hikari/pool/ProxyPreparedStatement.java
index 53a0ca1b..ae99e75a 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyPreparedStatement.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyPreparedStatement.java
@@ -21,7 +21,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 /**
- * This is the proxy class for java.sql.PreparedStatement.
+ * This is the proxy class for {@link PreparedStatement}.
  *
  * @author Brett Wooldridge
  */
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java b/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
index 286c1dc5..e97456d1 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
@@ -21,9 +21,10 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 /**
- * This is the proxy class for java.sql.ResultSet.
+ * This is the proxy class for {@link ResultSet}.
  *
  * @author Brett Wooldridge
+ * @author Yanming Zhou
  */
 public abstract class ProxyResultSet implements ResultSet
 {
@@ -85,6 +86,13 @@ public abstract class ProxyResultSet implements ResultSet
       delegate.deleteRow();
    }
 
+   /** {@inheritDoc} */
+   @Override
+   public final boolean isWrapperFor(Class<?> iface) throws SQLException
+   {
+      return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+   }
+
    /** {@inheritDoc} */
    @Override
    @SuppressWarnings("unchecked")
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java b/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
index 4bdce500..16ed6ff8 100644
--- a/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
+++ b/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
@@ -22,9 +22,10 @@ import java.sql.SQLException;
 import java.sql.Statement;
 
 /**
- * This is the proxy class for java.sql.Statement.
+ * This is the proxy class for {@link Statement}.
  *
  * @author Brett Wooldridge
+ * @author Yanming Zhou
  */
 public abstract class ProxyStatement implements Statement
 {
@@ -233,6 +234,13 @@ public abstract class ProxyStatement implements Statement
       return proxyResultSet;
    }
 
+   /** {@inheritDoc} */
+   @Override
+   public final boolean isWrapperFor(Class<?> iface) throws SQLException
+   {
+      return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+   }
+
    /** {@inheritDoc} */
    @Override
    @SuppressWarnings("unchecked")