@@ -22,8 +22,6 @@ public ObjectEnumWrapper(string enumType, string propertyName, Type objectType)
 
         protected override Func<TObject, TEnumType> CreateGetter()
         {
-            Type enumType = _objectType.Assembly.GetType($"{_objectType.Namespace}.{_enumType}");
-
             var inputVariable = Expression.Parameter(typeof(TObject));
             var converted = Expression.Convert(inputVariable, _objectType);
             var retreiver = Expression.Property(converted, _propertyName);
@@ -53,7 +51,6 @@ protected override Action<TObject, TEnumType> CreateSetter()
         }
     }
 
-
     public class ObjectWrapper<TObject, TValue>
     {
         private readonly string _propertyName;
@@ -76,7 +73,6 @@ public void SetValue(TObject command, TValue value)
             }
 
             _setter(command, value);
-
         }
 
         public TValue GetValue(TObject obj)
@@ -92,7 +88,8 @@ public TValue GetValue(TObject obj)
         protected virtual Func<TObject, TValue> CreateGetter()
         {
             var inputVariable = Expression.Parameter(typeof(TObject));
-            var retreiver = Expression.Property(inputVariable, typeof(TObject).GetProperty(_propertyName));
+            var casted = Expression.Convert(inputVariable, _objectType);
+            var retreiver = Expression.Property(casted, _objectType.GetProperty(_propertyName));
             return Expression.Lambda<Func<TObject, TValue>>(retreiver, inputVariable).Compile();
         }
 
@@ -112,3 +109,72 @@ protected virtual Action<TObject, TValue> CreateSetter()
         }
     }
 }
+
+
+public class ObjectWrapper<TObject, TValue>
+{
+    private readonly string _propertyName;
+    private readonly Type _objectType;
+
+    private Action<TObject, TValue> _setter;
+    private Func<TObject, TValue> _getter;
+
+    public ObjectWrapper(string propertyName, Type objectType)
+    {
+        _propertyName = propertyName;
+        _objectType = objectType;
+    }
+
+    public void SetValue(TObject command, TValue value)
+    {
+        if (_setter == null)
+        {
+            _setter = CreateSetter();
+        }
+
+        _setter(command, value);
+
+    }
+
+    public TValue GetValue(TObject obj)
+    {
+        if (_getter == null)
+        {
+            _getter = CreateGetter();
+        }
+
+        return _getter(obj);
+    }
+
+    protected virtual Func<TObject, TValue> CreateGetter()
+    {
+        var inputVariable = Expression.Parameter(typeof(TObject));
+        if (typeof(TObject) != _objectType)
+        {
+            var converted = Expression.Convert(inputVariable, _objectType);
+            var retreiver = Expression.Property(converted, _objectType.GetProperty(_propertyName));           
+            return Expression.Lambda<Func<TObject, TValue>>(retreiver, inputVariable).Compile();
+        }
+        else
+        {
+            var retreiver = Expression.Property(inputVariable, _objectType.GetProperty(_propertyName));
+            return Expression.Lambda<Func<TObject, TValue>>(retreiver, inputVariable).Compile();
+        }
+        
+    }
+
+
+    protected virtual Action<TObject, TValue> CreateSetter()
+    {
+        var inputVariable = Expression.Parameter(typeof(TObject));
+        var inputVariable2 = Expression.Parameter(typeof(TValue));
+
+        var convertExpression = Expression.Convert(inputVariable, _objectType);
+
+        var expression = Expression.Assign(
+            Expression.PropertyOrField(convertExpression, _propertyName),
+            inputVariable2);
+
+        return Expression.Lambda<Action<TObject, TValue>>(expression, inputVariable, inputVariable2).Compile();
+    }
+}
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using Dapper.Oracle;
 using Dapper.Oracle.Expressions;
 using FluentAssertions;
@@ -23,7 +24,7 @@ public static IEnumerable<object[]> OracleDataFixture
 #else
                 yield return new object[] { new Managed.OracleCommand() };
                 yield return new object[] { new UnManaged.OracleCommand() };
-#endif                                                
+#endif
             }
         }
     }
@@ -35,11 +36,13 @@ public void BasicTest(IDbCommand cmd)
         {
             var param = cmd.CreateParameter();
 
-            var setter = new ObjectEnumWrapper<IDbDataParameter, OracleMappingType>("OracleDbType", "OracleDbType", param.GetType());
+            var setter =
+                new ObjectEnumWrapper<IDbDataParameter, OracleMappingType>("OracleDbType", "OracleDbType",
+                    param.GetType());
             setter.SetValue(param, OracleMappingType.Date);
             var value = setter.GetValue(param);
             value.ToString().Should().Be("Date");
-        }        
+        }
     }
 
     public class ObjectWrapperTests : ParameterBaseTests
@@ -49,9 +52,42 @@ public void Test(IDbCommand cmd)
         {
             var param = cmd.CreateParameter();
             var wrapper = new ObjectWrapper<IDbDataParameter, int>("Size", param.GetType());
-            wrapper.SetValue(param,100);
+            wrapper.SetValue(param, 100);
             var result = wrapper.GetValue(param);
             result.Should().Be(100);
         }
+
+        [Fact]
+        public void SetPropertyOnClass()
+        {
+            var expected = Enumerable.Range(0, 10).ToArray();
+            var input = new TestClass() {PropertyWithGetterAndSetter = expected};
+            var testClass = new ObjectWrapper<TestClass,int[]>("PropertyWithGetterAndSetter",typeof(TestClass));
+
+            var actual = testClass.GetValue(input);
+            actual.Should().BeSameAs(expected);
+        }
+
+        [Fact]
+        public void SetPropertyOnInterface()
+        {
+            var expected = Enumerable.Range(0, 10).ToArray();
+            var input = new TestClass() { PropertyWithGetterAndSetter = expected };
+            var testClass = new ObjectWrapper<ITestClass, int[]>("PropertyWithGetterAndSetter", typeof(TestClass));
+
+            var actual = testClass.GetValue(input);
+            actual.Should().BeSameAs(expected);
+        }
+
+        private class TestClass : ITestClass
+        {
+            public int[] PropertyWithGetterAndSetter { get; set; }
+
+            public bool PropertyWithGetterOnly { get; }
+        }
+
+        private interface ITestClass { }
+                    
     }
 }
+            
@@ -153,5 +153,20 @@ public void ArrayBindSizeSet_ValueIsSet(IDbCommand cmd, IOracleParameterRetretre
             param.Value.Should().Be("Bar");
             param.ArrayBindSize.Should().BeSameAs(bindSizeArray);
         }
+
+        [Theory, MemberData(nameof(OracleCommandFixture))]
+        public void GetParameter_DoesNotReturnNull(IDbCommand cmd)
+        {
+            var bindSizeArray = Enumerable.Range(0, 20).ToArray();
+            testObject.Add("Foo", "Bar", arrayBindSize: bindSizeArray);
+
+            testObject.AddParam(cmd);
+
+            cmd.Parameters.Should().HaveCount(1);
+            var param = testObject.GetParameter("Foo");
+            param.Name.Should().Be("Foo");
+            param.Value.Should().Be("Bar");
+            param.ArrayBindSize.Should().BeSameAs(bindSizeArray);
+        }
     }
 }