diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
index 37cd087a8..8f5912e61 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
@@ -36,6 +36,7 @@ import com.mysema.query.types.expr.EBoolean;
 import com.mysema.query.types.path.PEntity;
 import com.mysema.query.types.query.ListSubQuery;
 import com.mysema.util.JDBCUtil;
+import com.mysema.util.MathUtils;
 import com.mysema.util.ResultSetAdapter;
 
 /**
@@ -187,20 +188,19 @@ public abstract class AbstractSQLQuery<Q extends AbstractSQLQuery<Q>> extends
 
     @SuppressWarnings("unchecked")
     private <T> T get(ResultSet rs, int i, Class<T> type) {
-        String methodName = "get" + type.getSimpleName();
-        if (methodName.equals("getInteger")) {
-            methodName = "getInt";
-        }
-        // TODO : cache methods
         try {
-            return (T) ResultSet.class.getMethod(methodName, int.class).invoke(rs, i);
-        } catch (SecurityException e) {
-            throw new QueryException(e);
-        } catch (IllegalAccessException e) {
-            throw new QueryException(e);
-        } catch (InvocationTargetException e) {
-            throw new QueryException(e);
-        } catch (NoSuchMethodException e) {
+            Object value = rs.getObject(i);
+            if (value != null && !type.isAssignableFrom(value.getClass())){
+                if (Number.class.isAssignableFrom(type)){
+                    return (T)MathUtils.cast((Number)value, (Class)type);
+                }else{
+                    throw new IllegalArgumentException(
+                        "Unable to cast " + value.getClass().getName() + " to " + type.getName());
+                }
+            }else{
+                return (T)value;
+            }
+        } catch (SQLException e) {
             throw new QueryException(e);
         }
     }
diff --git a/querydsl-sql/src/main/java/com/mysema/util/JDBCUtil.java b/querydsl-sql/src/main/java/com/mysema/util/JDBCUtil.java
index 2d096ae10..26932998d 100644
--- a/querydsl-sql/src/main/java/com/mysema/util/JDBCUtil.java
+++ b/querydsl-sql/src/main/java/com/mysema/util/JDBCUtil.java
@@ -5,13 +5,17 @@
  */
 package com.mysema.util;
 
-import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.sql.Blob;
+import java.sql.Clob;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.commons.lang.ClassUtils;
-
 import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 
@@ -34,36 +38,53 @@ public final class JDBCUtil {
                     o = params.get(o);
                 }
                 setParameter(stmt, counter++, o);
-            } catch (NoSuchMethodException e) {
-                throw new IllegalArgumentException(e);
-            } catch (IllegalAccessException e) {
-                throw new IllegalArgumentException(e);
-            } catch (InvocationTargetException e) {
+            } catch (SQLException e) {
                 throw new IllegalArgumentException(e);
             }
         }
     }
 
-    // TODO : don't use reflection here
-    private static void setParameter(PreparedStatement stmt, int i, Object o) throws NoSuchMethodException,
-        IllegalAccessException, InvocationTargetException {
-        Class<?> type = o.getClass();
-        String methodName = "set" + type.getSimpleName();
-        if (methodName.equals("setInteger")) {
-            methodName = "setInt";
-        }else if (methodName.equals("setCharacter")){
-            methodName = "setString";
-            type = String.class;
-            o = o.toString();
-        }else if (methodName.equals("setDate") && type.equals(java.util.Date.class)) {
-            type = java.sql.Date.class;
-            o = new java.sql.Date(((java.util.Date) o).getTime());
+    private static void setParameter(PreparedStatement stmt, int i, Object o) throws SQLException{
+        Class<?> type = o.getClass();        
+        if (type.equals(BigDecimal.class)){
+            stmt.setBigDecimal(i, (BigDecimal) o);    
+        }else if (type.equals(Blob.class)){
+            stmt.setBlob(i, (Blob) o);    
+        }else if (type.equals(Boolean.class)){
+            stmt.setBoolean(i, (Boolean) o);    
+        }else if (type.equals(Byte.class)){
+            stmt.setByte(i, (Byte)o);    
+        }else if (type.equals(byte[].class)){
+            stmt.setBytes(i, (byte[])o); 
+        }else if (type.equals(Character.class)){
+            stmt.setString(i, String.valueOf(o.toString()));            
+        }else if (type.equals(Clob.class)){
+            stmt.setClob(i, (Clob)o);    
+        }else if (type.equals(java.sql.Date.class)){
+            stmt.setDate(i, (java.sql.Date)o);    
+        }else if (type.equals(java.util.Date.class)){
+            stmt.setDate(i, new java.sql.Date(((java.util.Date)o).getTime()));
+        }else if (type.equals(Double.class)){
+            stmt.setDouble(i, (Double) o);    
+        }else if (type.equals(Float.class)){
+            stmt.setFloat(i, (Float) o);    
+        }else if (type.equals(Integer.class)){
+            stmt.setInt(i, (Integer) o);    
+        }else if (type.equals(Long.class)){
+            stmt.setLong(i, (Long) o);    
+        }else if (type.equals(Short.class)){
+            stmt.setShort(i, (Short) o);    
+        }else if (type.equals(String.class)){
+            stmt.setString(i, (String)o);    
+        }else if (type.equals(Time.class)){
+            stmt.setTime(i, (Time)o);    
+        }else if (type.equals(Timestamp.class)){
+            stmt.setTimestamp(i, (Timestamp)o);    
+        }else if (type.equals(URL.class)){
+            stmt.setURL(i, (URL)o);    
+        }else{
+            stmt.setObject(i, o);
         }
-
-        type = ClassUtils.wrapperToPrimitive(type) != null ? ClassUtils.wrapperToPrimitive(type) : type;
-
-        // TODO : cache methods
-        PreparedStatement.class.getMethod(methodName, int.class, type).invoke(stmt, i, o);
     }
 
 }