diff --git a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
index 1d226af103f1a..71934e9d76314 100644
--- a/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
+++ b/modules/core/src/test/java/org/apache/ignite/platform/PlatformDeployServiceTask.java
@@ -54,10 +54,14 @@
 import org.apache.ignite.platform.model.Parameter;
 import org.apache.ignite.platform.model.Role;
 import org.apache.ignite.platform.model.User;
+import org.apache.ignite.platform.model.V10;
+import org.apache.ignite.platform.model.V11;
+import org.apache.ignite.platform.model.V12;
 import org.apache.ignite.platform.model.V5;
 import org.apache.ignite.platform.model.V6;
 import org.apache.ignite.platform.model.V7;
 import org.apache.ignite.platform.model.V8;
+import org.apache.ignite.platform.model.V9;
 import org.apache.ignite.platform.model.Value;
 import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.services.Service;
@@ -651,6 +655,23 @@ public void testLocalDateFromCache() {
             cache.put(8, ts2);
         }
 
+        /** */
+        public void putValsForCache() {
+            ignite.<Integer, V9>getOrCreateCache("V9").put(1, new V9("1"));
+
+            IgniteCache<Integer, V10> v10 = ignite.getOrCreateCache("V10");
+
+            v10.put(1, new V10("1"));
+            v10.put(2, new V10("2"));
+
+            ignite.<Integer, V11>getOrCreateCache("V11").put(1, new V11("1"));
+
+            IgniteCache<Integer, V12> v12 = ignite.getOrCreateCache("V12");
+
+            v12.put(1, new V12("1"));
+            v12.put(2, new V12("2"));
+        }
+
         /** */
         private final AtomicInteger cntMsgs = new AtomicInteger(0);
 
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/V10.java b/modules/core/src/test/java/org/apache/ignite/platform/model/V10.java
new file mode 100644
index 0000000000000..4cdac5725e3ba
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/V10.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.model;
+
+/** Test V10 object. */
+public class V10 {
+    /** */
+    private final String name;
+
+    /** */
+    public V10(String name) {
+        this.name = name;
+    }
+
+    /** */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/V11.java b/modules/core/src/test/java/org/apache/ignite/platform/model/V11.java
new file mode 100644
index 0000000000000..b1e880ba0cbbc
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/V11.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.model;
+
+/** Test V11 object. */
+public class V11 {
+    /** */
+    private final String name;
+
+    /** */
+    public V11(String name) {
+        this.name = name;
+    }
+
+    /** */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/V12.java b/modules/core/src/test/java/org/apache/ignite/platform/model/V12.java
new file mode 100644
index 0000000000000..a0b6a0cbd6a62
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/V12.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.model;
+
+/** Test V12 object. */
+public class V12 {
+    /** */
+    private final String name;
+
+    /** */
+    public V12(String name) {
+        this.name = name;
+    }
+
+    /** */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/platform/model/V9.java b/modules/core/src/test/java/org/apache/ignite/platform/model/V9.java
new file mode 100644
index 0000000000000..67f856235eb82
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/platform/model/V9.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.platform.model;
+
+/** Test V9 object. */
+public class V9 {
+    /** */
+    private final String name;
+
+    /** */
+    public V9(String name) {
+        this.name = name;
+    }
+
+    /** */
+    public String getName() {
+        return name;
+    }
+}
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/IJavaService.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/IJavaService.cs
index db1b546a9a6fe..895a30f9066a5 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/IJavaService.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/IJavaService.cs
@@ -213,6 +213,9 @@ public interface IJavaService
         /** */
         void sleep(long delayMs);
 
+        /** */
+        void putValsForCache();
+
         /** */
         void startReceiveMessage();
 
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/JavaServiceDynamicProxy.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/JavaServiceDynamicProxy.cs
index b872b3c0ffdf0..02e110bf736fd 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/JavaServiceDynamicProxy.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/JavaServiceDynamicProxy.cs
@@ -413,6 +413,12 @@ public void testSendMessage()
             _svc.testSendMessage();
         }
 
+        /** <inheritDoc /> */
+        public void putValsForCache()
+        {
+            _svc.putValsForCache();
+        }
+
         /** <inheritDoc /> */
         public object testRoundtrip(object x)
         {
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/Model.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/Model.cs
index b0b9645bc0957..b1f350caa531a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/Model.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/Model.cs
@@ -212,12 +212,32 @@ public class V5 { public String Name { get; set; } }
     public class V6 { public String Name { get; set; } }
 
     /// <summary>
-    /// A class is a clone of Java class V6 with the same namespace.
+    /// A class is a clone of Java class V7 with the same namespace.
     /// </summary>
     public class V7 { public String Name { get; set; } }
 
     /// <summary>
-    /// A class is a clone of Java class V6 with the same namespace.
+    /// A class is a clone of Java class V8 with the same namespace.
     /// </summary>
     public class V8 { public String Name { get; set; } }
+
+    /// <summary>
+    /// A class is a clone of Java class V9 with the same namespace.
+    /// </summary>
+    public class V9 { public String Name { get; set; } }
+
+    /// <summary>
+    /// A class is a clone of Java class V10 with the same namespace.
+    /// </summary>
+    public class V10 { public String Name { get; set; } }
+
+    /// <summary>
+    /// A class is a clone of Java class V11 with the same namespace.
+    /// </summary>
+    public class V11 { public String Name { get; set; } }
+
+    /// <summary>
+    /// A class is a clone of Java class V12 with the same namespace.
+    /// </summary>
+    public class V12 { public String Name { get; set; } }
 }
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/PlatformTestService.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/PlatformTestService.cs
index f5a6d62c64c54..e6276ed3e3d30 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/PlatformTestService.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/PlatformTestService.cs
@@ -638,6 +638,23 @@ public void testSendMessage()
             throw new NotImplementedException();
         }
 
+        public void putValsForCache()
+        {
+            _ignite.GetOrCreateCache<int, V9>("V9").Put(1, new V9 {Name = "1"});
+
+            var v10 = _ignite.GetOrCreateCache<int, V10>("V10");
+
+            v10.Put(1, new V10 {Name = "1"});
+            v10.Put(2, new V10 {Name = "2"});
+
+            _ignite.GetOrCreateCache<int, V11>("V11").Put(1, new V11 {Name = "1"});
+
+            var v12 = _ignite.GetOrCreateCache<int, V12>("V12");
+
+            v12.Put(1, new V12 {Name = "1"});
+            v12.Put(2, new V12 {Name = "2"});
+        }
+
         /** <inheritDoc /> */
         public object testRoundtrip(object x)
         {
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTypeAutoResolveTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTypeAutoResolveTest.cs
index c22d2cbab6527..f2803c4bc426b 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTypeAutoResolveTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Services/ServicesTypeAutoResolveTest.cs
@@ -287,6 +287,36 @@ private void DoTestService(IJavaService svc, bool isPlatform = false)
 
             if (_useBinaryArray)
                 Assert.AreEqual(typeof(User[]), users2.GetType());
+
+            svc.putValsForCache();
+
+            Assert.AreEqual("1", _grid1.GetCache<int, V9>("V9").Get(1).Name);
+
+            var v10 = _grid1.GetCache<int, V10>("V10").GetAll(new List<int> {1, 2});
+
+            Assert.AreEqual(2, v10.Count);
+
+            foreach (var entry in v10)
+            {
+                if (entry.Key == 1)
+                    Assert.AreEqual("1", entry.Value.Name);
+                else
+                    Assert.AreEqual("2", entry.Value.Name);
+            }
+
+            Assert.AreEqual("1", _grid1.GetCache<int, V11>("V11").GetAsync(1).Result.Name);
+
+            var v12 = _grid1.GetCache<int, V12>("V12").GetAllAsync(new List<int> {1, 2}).Result;
+
+            Assert.AreEqual(2, v12.Count);
+
+            foreach (var entry in v12)
+            {
+                if (entry.Key == 1)
+                    Assert.AreEqual("1", entry.Value.Name);
+                else
+                    Assert.AreEqual("2", entry.Value.Name);
+            }
         }
 
         /// <summary>
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
index b62faabd5d77f..325fec3a89d87 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Cache/CacheImpl.cs
@@ -142,7 +142,7 @@ private bool CanUsePlatformCache
         /// </summary>
         private Task DoOutOpAsync<T1>(CacheOp op, T1 val1)
         {
-            return DoOutOpAsync<object, T1>((int) op, val1);
+            return DoOutOpAsync<object, T1>((int) op, val1, IsKeepBinary);
         }
 
         /// <summary>
@@ -150,7 +150,7 @@ private Task DoOutOpAsync<T1>(CacheOp op, T1 val1)
         /// </summary>
         private Task<TR> DoOutOpAsync<T1, TR>(CacheOp op, T1 val1)
         {
-            return DoOutOpAsync<T1, TR>((int) op, val1);
+            return DoOutOpAsync<T1, TR>((int) op, val1, IsKeepBinary);
         }
 
         /// <summary>
@@ -158,7 +158,7 @@ private Task<TR> DoOutOpAsync<T1, TR>(CacheOp op, T1 val1)
         /// </summary>
         private Task DoOutOpAsync<T1, T2>(CacheOp op, T1 val1, T2 val2)
         {
-            return DoOutOpAsync<T1, T2, object>((int) op, val1, val2);
+            return DoOutOpAsync<T1, T2, object>((int) op, val1, val2, IsKeepBinary);
         }
 
         /// <summary>
@@ -166,7 +166,7 @@ private Task DoOutOpAsync<T1, T2>(CacheOp op, T1 val1, T2 val2)
         /// </summary>
         private Task<TR> DoOutOpAsync<T1, T2, TR>(CacheOp op, T1 val1, T2 val2)
         {
-            return DoOutOpAsync<T1, T2, TR>((int) op, val1, val2);
+            return DoOutOpAsync<T1, T2, TR>((int) op, val1, val2, IsKeepBinary);
         }
 
         /// <summary>
@@ -197,7 +197,7 @@ public string Name
         public CacheConfiguration GetConfiguration()
         {
             return DoInOp((int) CacheOp.GetConfig, stream => new CacheConfiguration(
-                BinaryUtils.Marshaller.StartUnmarshal(stream)));
+                BinaryUtils.Marshaller.StartUnmarshal(stream)), IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -270,7 +270,7 @@ public ICache<TK, TV> WithExpiryPolicy(IExpiryPolicy plc)
         {
             IgniteArgumentCheck.NotNull(plc, "plc");
 
-            var cache0 = DoOutOpObject((int)CacheOp.WithExpiryPolicy, w => ExpiryPolicySerializer.WritePolicy(w, plc));
+            var cache0 = DoOutOpObject((int)CacheOp.WithExpiryPolicy, w => ExpiryPolicySerializer.WritePolicy(w, plc), IsKeepBinary);
 
             return new CacheImpl<TK, TV>(
                 cache0,
@@ -295,7 +295,7 @@ public bool IsAllowAtomicOpsInTx
         /** <inheritDoc /> */
         public void LoadCache(ICacheEntryFilter<TK, TV> p, params object[] args)
         {
-            DoOutInOpX((int) CacheOp.LoadCache, writer => WriteLoadCacheData(writer, p, args), _readException);
+            DoOutInOpX((int) CacheOp.LoadCache, writer => WriteLoadCacheData(writer, p, args), _readException, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -307,7 +307,7 @@ public Task LoadCacheAsync(ICacheEntryFilter<TK, TV> p, params object[] args)
         /** <inheritDoc /> */
         public void LocalLoadCache(ICacheEntryFilter<TK, TV> p, params object[] args)
         {
-            DoOutInOpX((int) CacheOp.LocLoadCache, writer => WriteLoadCacheData(writer, p, args), _readException);
+            DoOutInOpX((int) CacheOp.LocLoadCache, writer => WriteLoadCacheData(writer, p, args), _readException, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -511,7 +511,7 @@ public bool TryLocalPeek(TK key, out TV value, params CachePeekMode[] modes)
                     w.WriteInt(peekModes);
                 },
                 (s, r) => r == True ? new CacheResult<TV>(Unmarshal<TV>(s)) : new CacheResult<TV>(),
-                _readException);
+                _readException, IsKeepBinary);
 
             value = res.Success ? res.Value : default(TV);
 
@@ -552,7 +552,7 @@ public TV Get(TK key)
                         throw GetKeyNotFoundException(key);
 
                     return Unmarshal<TV>(stream);
-                }, _readException);
+                }, _readException, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -657,7 +657,7 @@ public ICollection<ICacheEntry<TK, TV>> GetAll(IEnumerable<TK> keys)
                         (s, r) => r == True
                             ? ReadGetAllDictionary(Marshaller.StartUnmarshal(s, _flagKeepBinary), res)
                             : res,
-                        _readException);
+                        _readException, IsKeepBinary);
                     // ReSharper restore AccessToDisposedClosure
                 }
             }
@@ -667,7 +667,7 @@ public ICollection<ICacheEntry<TK, TV>> GetAll(IEnumerable<TK> keys)
                 (s, r) => r == True
                     ? ReadGetAllDictionary(Marshaller.StartUnmarshal(s, _flagKeepBinary))
                     : null,
-                _readException);
+                _readException, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -1209,7 +1209,7 @@ private long Size0(bool loc, int? part, params CachePeekMode[] modes)
                 {
                     writer.WriteBoolean(false);
                 }
-            }) + platformCacheSize;
+            }, IsKeepBinary) + platformCacheSize;
         }
 
         /// <summary>
@@ -1315,7 +1315,7 @@ public TRes Invoke<TArg, TRes>(TK key, ICacheEntryProcessor<TK, TV, TArg, TRes>
                         writer.WriteObjectDetached(holder);
                     },
                     (input, res) => res == True ? Unmarshal<TRes>(input) : default(TRes),
-                    _readException);
+                    _readException, IsKeepBinary);
             }
             finally
             {
@@ -1395,7 +1395,7 @@ public ICollection<ICacheEntryProcessorResult<TK, TRes>> InvokeAll<TArg, TRes>(I
                     },
                     (input, res) => res == True
                         ? ReadInvokeAllResults<TRes>(Marshaller.StartUnmarshal(input, IsKeepBinary))
-                        : null, _readException);
+                        : null, _readException, IsKeepBinary);
             }
             finally
             {
@@ -1456,7 +1456,7 @@ public T DoOutInOpExtension<T>(int extensionId, int opCode, Action<IBinaryRawWri
                 },
                 (input, res) => res == True
                     ? readFunc(Marshaller.StartUnmarshal(input))
-                    : default(T), _readException);
+                    : default(T), _readException, IsKeepBinary);
         }
 
         /** <inheritdoc /> */
@@ -1465,7 +1465,7 @@ public ICacheLock Lock(TK key)
             IgniteArgumentCheck.NotNull(key, "key");
 
             return DoOutInOpX((int) CacheOp.Lock, w => w.Write(key),
-                (stream, res) => new CacheLock(stream.ReadInt(), this), _readException);
+                (stream, res) => new CacheLock(stream.ReadInt(), this), _readException, IsKeepBinary);
         }
 
         /** <inheritdoc /> */
@@ -1474,7 +1474,7 @@ public ICacheLock LockAll(IEnumerable<TK> keys)
             IgniteArgumentCheck.NotNull(keys, "keys");
 
             return DoOutInOpX((int) CacheOp.LockAll, w => w.WriteEnumerable(keys),
-                (stream, res) => new CacheLock(stream.ReadInt(), this), _readException);
+                (stream, res) => new CacheLock(stream.ReadInt(), this), _readException, IsKeepBinary);
         }
 
         /** <inheritdoc /> */
@@ -1497,7 +1497,7 @@ public ICacheMetrics GetMetrics()
                 IBinaryRawReader reader = Marshaller.StartUnmarshal(stream, false);
 
                 return new CacheMetricsImpl(reader);
-            });
+            }, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -1521,7 +1521,7 @@ public ICacheMetrics GetLocalMetrics()
                 IBinaryRawReader reader = Marshaller.StartUnmarshal(stream, false);
 
                 return new CacheMetricsImpl(reader);
-            });
+            }, IsKeepBinary);
         }
 
         /** <inheritDoc /> */
@@ -1592,7 +1592,7 @@ public ICollection<int> GetLostPartitions()
                 }
 
                 return res;
-            });
+            }, IsKeepBinary);
         }
 
         #region Queries
@@ -1639,7 +1639,7 @@ public IQueryCursor<ICacheEntry<TK, TV>> Query(QueryBase qry)
                 }
             }
 
-            var cursor = DoOutOpObject((int) qry.OpId, writer => qry.Write(writer, IsKeepBinary));
+            var cursor = DoOutOpObject((int) qry.OpId, writer => qry.Write(writer, IsKeepBinary), IsKeepBinary);
 
             return new QueryCursor<TK, TV>(cursor, _flagKeepBinary);
         }
@@ -1667,7 +1667,7 @@ public IContinuousQueryHandleFields QueryContinuous(ContinuousQuery<TK, TV> qry,
             qry.Validate();
 
             return new ContinuousQueryHandleImpl<TK, TV>(qry, Marshaller, _flagKeepBinary,
-                writeAction => DoOutOpObject((int) CacheOp.QryContinuous, writeAction), initialQry);
+                writeAction => DoOutOpObject((int) CacheOp.QryContinuous, writeAction, IsKeepBinary), initialQry);
         }
 
         /// <summary>
@@ -1679,7 +1679,7 @@ private IContinuousQueryHandle<ICacheEntry<TK, TV>> QueryContinuousImpl(Continuo
             qry.Validate();
 
             return new ContinuousQueryHandleImpl<TK, TV>(qry, Marshaller, _flagKeepBinary,
-                writeAction => DoOutOpObject((int) CacheOp.QryContinuous, writeAction), initialQry);
+                writeAction => DoOutOpObject((int) CacheOp.QryContinuous, writeAction, IsKeepBinary), initialQry);
         }
 
         #endregion
@@ -1734,7 +1734,7 @@ internal CacheEnumerator<TK, TV> CreateEnumerator(bool loc, int peekModes)
         {
             if (loc)
             {
-                var target = DoOutOpObject((int) CacheOp.LocIterator, (IBinaryStream s) => s.WriteInt(peekModes));
+                var target = DoOutOpObject((int) CacheOp.LocIterator, (IBinaryStream s) => s.WriteInt(peekModes), IsKeepBinary);
 
                 return new CacheEnumerator<TK, TV>(target, _flagKeepBinary);
             }
@@ -1861,7 +1861,7 @@ private bool DoOutOp<T1>(CacheOp op, T1 x)
             return DoOutInOpX((int) op, w =>
             {
                 w.Write(x);
-            }, _readException);
+            }, _readException, IsKeepBinary);
         }
 
         /// <summary>
@@ -1873,7 +1873,7 @@ private bool DoOutOp<T1, T2>(CacheOp op, T1 x, T2 y)
             {
                 w.WriteObjectDetached(x);
                 w.WriteObjectDetached(y);
-            }, _readException);
+            }, _readException, IsKeepBinary);
         }
 
         /// <summary>
@@ -1886,7 +1886,7 @@ private bool DoOutOp<T1, T2, T3>(CacheOp op, T1 x, T2 y, T3 z)
                 w.WriteObjectDetached(x);
                 w.WriteObjectDetached(y);
                 w.WriteObjectDetached(z);
-            }, _readException);
+            }, _readException, IsKeepBinary);
         }
 
         /// <summary>
@@ -1894,7 +1894,7 @@ private bool DoOutOp<T1, T2, T3>(CacheOp op, T1 x, T2 y, T3 z)
         /// </summary>
         private bool DoOutOp(CacheOp op, Action<BinaryWriter> write)
         {
-            return DoOutInOpX((int) op, write, _readException);
+            return DoOutInOpX((int) op, write, _readException, IsKeepBinary);
         }
 
         /// <summary>
@@ -1905,7 +1905,7 @@ private CacheResult<TV> DoOutInOpNullable(CacheOp cacheOp, TK x)
             return DoOutInOpX((int)cacheOp,
                 w => w.Write(x),
                 (stream, res) => res == True ? new CacheResult<TV>(Unmarshal<TV>(stream)) : new CacheResult<TV>(),
-                _readException);
+                _readException, IsKeepBinary);
         }
 
         /// <summary>
@@ -1920,7 +1920,7 @@ private CacheResult<TV> DoOutInOpNullable<T1, T2>(CacheOp cacheOp, T1 x, T2 y)
                     w.WriteObjectDetached(y);
                 },
                 (stream, res) => res == True ? new CacheResult<TV>(Unmarshal<TV>(stream)) : new CacheResult<TV>(),
-                _readException);
+                _readException, IsKeepBinary);
         }
 
         /** <inheritdoc /> */
@@ -1936,7 +1936,7 @@ public bool TryEnter(long id, TimeSpan timeout)
                    {
                        s.WriteLong(id);
                        s.WriteLong((long) timeout.TotalMilliseconds);
-                   }) == True;
+                   }, IsKeepBinary) == True;
         }
 
         /** <inheritdoc /> */
@@ -1959,7 +1959,7 @@ public IQueryMetrics GetQueryMetrics()
                 IBinaryRawReader reader = Marshaller.StartUnmarshal(stream, false);
 
                 return new QueryMetricsImpl(reader);
-            });
+            }, IsKeepBinary);
         }
 
         /** <inheritdoc /> */
@@ -2109,7 +2109,7 @@ private IPlatformTargetInternal QueryFieldsInternal(SqlFieldsQuery qry)
             if (string.IsNullOrEmpty(qry.Sql))
                 throw new ArgumentException("Sql cannot be null or empty");
 
-            return DoOutOpObject((int) CacheOp.QrySqlFields, writer => qry.Write(writer));
+            return DoOutOpObject((int) CacheOp.QrySqlFields, writer => qry.Write(writer), IsKeepBinary);
         }
     }
 }
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeImpl.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeImpl.cs
index 153775c4f1ba6..ac85e5332dfa6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeImpl.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeImpl.cs
@@ -159,7 +159,7 @@ public void WithKeepBinary()
         /// <returns>New <see cref="ComputeImpl"/> instance associated with a specified executor.</returns>
         public ComputeImpl WithExecutor(string executorName)
         {
-            var target = DoOutOpObject(OpWithExecutor, w => w.WriteString(executorName));
+            var target = DoOutOpObject(OpWithExecutor, w => w.WriteString(executorName), _keepBinary.Value);
 
             return new ComputeImpl(target, _prj, _keepBinary.Value);
         }
@@ -180,7 +180,7 @@ public TReduceRes ExecuteJavaTask<TReduceRes>(string taskName, object taskArg)
 
             try
             {
-                return DoOutInOp<TReduceRes>(OpExec, writer => WriteTask(writer, taskName, taskArg, nodes));
+                return DoOutInOp<TReduceRes>(OpExec, writer => WriteTask(writer, taskName, taskArg, nodes), _keepBinary.Value);
             }
             finally
             {
@@ -206,7 +206,7 @@ public Future<TReduceRes> ExecuteJavaTaskAsync<TReduceRes>(string taskName, obje
 
             try
             {
-                return DoOutOpObjectAsync<TReduceRes>(OpExecAsync, w => WriteTask(w, taskName, taskArg, nodes));
+                return DoOutOpObjectAsync<TReduceRes>(OpExecAsync, w => WriteTask(w, taskName, taskArg, nodes), _keepBinary.Value);
             }
             finally
             {
@@ -235,7 +235,7 @@ public Future<TReduceRes> Execute<TArg, TJobRes, TReduceRes>(IComputeTask<TArg,
             {
                 s.WriteLong(ptr);
                 s.WriteLong(_prj.TopologyVersion);
-            });
+            }, _keepBinary.Value);
 
             var future = holder.Future;
 
@@ -562,7 +562,7 @@ private Future<TJobRes> DoAffinityOp<TJobRes>(object cacheNames, int? partition,
 
                     w.WriteWithPeerDeployment(func);
                     w.WriteLong(handle);
-                });
+                }, _keepBinary.Value);
 
                 fut.Task.ContWith(_ => handleRegistry.Release(handle), TaskContinuationOptions.ExecuteSynchronously);
 
@@ -653,7 +653,7 @@ private Future<TReduceRes> ExecuteClosures0<TArg, TJobRes, TReduceRes>(
 
                         if (writeAction != null)
                             writeAction(writer);
-                    });
+                    }, _keepBinary.Value);
 
                     holder.Future.SetTarget(new Listenable(futTarget));
                 }
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTargetAdapter.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTargetAdapter.cs
index d56656ec0aac2..92b4ea68ab81d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTargetAdapter.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/PlatformTargetAdapter.cs
@@ -93,15 +93,41 @@ public Marshaller Marshaller
 
         #region OUT operations
 
+        /// <summary>
+        /// Enables Register Same Java Type mode is keepBinary = false.
+        /// </summary>
+        /// <param name="action">Action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
+        /// <returns></returns>
+        private static T WithReg<T>(Func<T> action, bool keepBinary)
+        {
+            if (keepBinary)
+                return action.Invoke();
+
+            bool locRegisterSameJavaType = Marshaller.RegisterSameJavaTypeTl.Value;
+
+            Marshaller.RegisterSameJavaTypeTl.Value = true;
+
+            try
+            {
+                return action.Invoke();
+            }
+            finally
+            {
+                Marshaller.RegisterSameJavaTypeTl.Value = locRegisterSameJavaType;
+            }
+        }
+
         /// <summary>
         /// Perform out operation.
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="action">Action to be performed on the stream.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns></returns>
-        protected long DoOutOp(int type, Action<IBinaryStream> action)
+        protected long DoOutOp(int type, Action<IBinaryStream> action, bool keepBinary = false)
         {
-            return _target.InStreamOutLong(type, action);
+            return WithReg(() => _target.InStreamOutLong(type, action), keepBinary);
         }
 
         /// <summary>
@@ -109,10 +135,11 @@ protected long DoOutOp(int type, Action<IBinaryStream> action)
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="action">Action to be performed on the stream.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns></returns>
-        protected long DoOutOp(int type, Action<BinaryWriter> action)
+        protected long DoOutOp(int type, Action<BinaryWriter> action, bool keepBinary = false)
         {
-            return DoOutOp(type, stream => WriteToStream(action, stream, _marsh));
+            return DoOutOp(type, stream => WriteToStream(action, stream, _marsh), keepBinary);
         }
 
         /// <summary>
@@ -120,10 +147,11 @@ protected long DoOutOp(int type, Action<BinaryWriter> action)
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="action">Action to be performed on the stream.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Resulting object.</returns>
-        protected IPlatformTargetInternal DoOutOpObject(int type, Action<BinaryWriter> action)
+        protected IPlatformTargetInternal DoOutOpObject(int type, Action<BinaryWriter> action, bool keepBinary = false)
         {
-            return _target.InStreamOutObject(type, stream => WriteToStream(action, stream, _marsh));
+            return WithReg(() => _target.InStreamOutObject(type, stream => WriteToStream(action, stream, _marsh)), keepBinary);
         }
 
         /// <summary>
@@ -131,10 +159,11 @@ protected IPlatformTargetInternal DoOutOpObject(int type, Action<BinaryWriter> a
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="action">Action to be performed on the stream.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Resulting object.</returns>
-        protected IPlatformTargetInternal DoOutOpObject(int type, Action<IBinaryStream> action)
+        protected IPlatformTargetInternal DoOutOpObject(int type, Action<IBinaryStream> action, bool keepBinary = false)
         {
-            return _target.InStreamOutObject(type, action);
+            return WithReg(() => _target.InStreamOutObject(type, action), keepBinary);
         }
 
         /// <summary>
@@ -152,13 +181,14 @@ protected IPlatformTargetInternal DoOutOpObject(int type)
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="val1">Value.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected long DoOutOp<T1>(int type, T1 val1)
+        protected long DoOutOp<T1>(int type, T1 val1, bool keepBinary = false)
         {
             return DoOutOp(type, writer =>
             {
                 writer.Write(val1);
-            });
+            }, keepBinary);
         }
 
         /// <summary>
@@ -167,14 +197,15 @@ protected long DoOutOp<T1>(int type, T1 val1)
         /// <param name="type">Operation type.</param>
         /// <param name="val1">Value 1.</param>
         /// <param name="val2">Value 2.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected long DoOutOp<T1, T2>(int type, T1 val1, T2 val2)
+        protected long DoOutOp<T1, T2>(int type, T1 val1, T2 val2, bool keepBinary = false)
         {
             return DoOutOp(type, writer =>
             {
                 writer.Write(val1);
                 writer.Write(val2);
-            });
+            }, keepBinary);
         }
 
         #endregion
@@ -186,10 +217,11 @@ protected long DoOutOp<T1, T2>(int type, T1 val1, T2 val2)
         /// </summary>
         /// <param name="type">Type.</param>
         /// <param name="action">Action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected T DoInOp<T>(int type, Func<IBinaryStream, T> action)
+        protected T DoInOp<T>(int type, Func<IBinaryStream, T> action, bool keepBinary = false)
         {
-            return _target.OutStream(type, action);
+            return WithReg(() => _target.OutStream(type, action), keepBinary);
         }
 
         /// <summary>
@@ -213,10 +245,11 @@ protected T DoInOp<T>(int type)
         /// <param name="outAction">Out action.</param>
         /// <param name="inAction">In action.</param>
         /// <param name="errorAction">Error action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction, Func<IBinaryStream, TR> inAction, Func<Exception, TR> errorAction = null)
+        protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction, Func<IBinaryStream, TR> inAction, Func<Exception, TR> errorAction = null, bool keepBinary = false)
         {
-            return _target.InStreamOutStream(type, stream => WriteToStream(outAction, stream, _marsh), inAction, errorAction);
+            return WithReg(() => _target.InStreamOutStream(type, stream => WriteToStream(outAction, stream, _marsh), inAction, errorAction), keepBinary);
         }
 
         /// <summary>
@@ -227,14 +260,15 @@ protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction, Func<IBinar
         /// <param name="outAction">Out action.</param>
         /// <param name="inAction">In action.</param>
         /// <param name="inErrorAction">The action to read an error.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>
         /// Result.
         /// </returns>
         protected TR DoOutInOpX<TR>(int type, Action<BinaryWriter> outAction, Func<IBinaryStream, long, TR> inAction,
-            Func<IBinaryStream, Exception> inErrorAction)
+            Func<IBinaryStream, Exception> inErrorAction, bool keepBinary = false)
         {
-            return _target.InStreamOutLong(type, stream => WriteToStream(outAction, stream, _marsh), 
-                inAction, inErrorAction);
+            return WithReg(() => _target.InStreamOutLong(type, stream => WriteToStream(outAction, stream, _marsh), 
+                inAction, inErrorAction), keepBinary);
         }
 
         /// <summary>
@@ -243,14 +277,15 @@ protected TR DoOutInOpX<TR>(int type, Action<BinaryWriter> outAction, Func<IBina
         /// <param name="type">Operation type.</param>
         /// <param name="outAction">Out action.</param>
         /// <param name="inErrorAction">The action to read an error.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>
         /// Result.
         /// </returns>
         protected bool DoOutInOpX(int type, Action<BinaryWriter> outAction,
-            Func<IBinaryStream, Exception> inErrorAction)
+            Func<IBinaryStream, Exception> inErrorAction, bool keepBinary = false)
         {
-            return _target.InStreamOutLong(type, stream => WriteToStream(outAction, stream, _marsh), 
-                (stream, res) => res == True, inErrorAction);
+            return WithReg(() => _target.InStreamOutLong(type, stream => WriteToStream(outAction, stream, _marsh), 
+                (stream, res) => res == True, inErrorAction), keepBinary);
         }
 
         /// <summary>
@@ -260,12 +295,13 @@ protected bool DoOutInOpX(int type, Action<BinaryWriter> outAction,
         /// <param name="outAction">Out action.</param>
         /// <param name="inAction">In action.</param>
         /// <param name="arg">Argument.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
         protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction,
-            Func<IBinaryStream, IPlatformTargetInternal, TR> inAction, IPlatformTargetInternal arg)
+            Func<IBinaryStream, IPlatformTargetInternal, TR> inAction, IPlatformTargetInternal arg, bool keepBinary = false)
         {
-            return _target.InObjectStreamOutObjectStream(type, stream => WriteToStream(outAction, stream, _marsh), 
-                inAction, arg);
+            return WithReg(() => _target.InObjectStreamOutObjectStream(type, stream => WriteToStream(outAction, stream, _marsh), 
+                inAction, arg), keepBinary);
         }
 
         /// <summary>
@@ -273,11 +309,12 @@ protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction,
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="outAction">Out action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction)
+        protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction, bool keepBinary = false)
         {
-            return _target.InStreamOutStream(type, stream => WriteToStream(outAction, stream, _marsh), 
-                stream => Unmarshal<TR>(stream));
+            return WithReg(() => _target.InStreamOutStream(type, stream => WriteToStream(outAction, stream, _marsh), 
+                stream => Unmarshal<TR>(stream)), keepBinary);
         }
 
         /// <summary>
@@ -285,11 +322,12 @@ protected TR DoOutInOp<TR>(int type, Action<BinaryWriter> outAction)
         /// </summary>
         /// <param name="type">Operation type.</param>
         /// <param name="val">Value.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Result.</returns>
-        protected TR DoOutInOp<T1, TR>(int type, T1 val)
+        protected TR DoOutInOp<T1, TR>(int type, T1 val, bool keepBinary = false)
         {
-            return _target.InStreamOutStream(type, stream => WriteToStream(val, stream, _marsh),
-                stream => Unmarshal<TR>(stream));
+            return WithReg(() => _target.InStreamOutStream(type, stream => WriteToStream(val, stream, _marsh),
+                stream => Unmarshal<TR>(stream)), keepBinary);
         }
 
         /// <summary>
@@ -312,10 +350,11 @@ protected long DoOutInOp(int type, long val = 0)
         /// </summary>
         /// <param name="type">The type code.</param>
         /// <param name="writeAction">The write action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Task for async operation</returns>
-        protected Task DoOutOpAsync(int type, Action<BinaryWriter> writeAction = null)
+        protected Task DoOutOpAsync(int type, Action<BinaryWriter> writeAction = null, bool keepBinary = false)
         {
-            return DoOutOpAsync<object>(type, writeAction);
+            return DoOutOpAsync<object>(type, writeAction, keepBinary);
         }
 
         /// <summary>
@@ -338,7 +377,7 @@ protected Task<T> DoOutOpAsync<T>(int type, Action<BinaryWriter> writeAction = n
                 }
                 w.WriteLong(futId);
                 w.WriteInt(futType);
-            }), keepBinary, convertFunc).Task;
+            }, keepBinary), keepBinary, convertFunc).Task;
         }
 
         /// <summary>
@@ -347,15 +386,16 @@ protected Task<T> DoOutOpAsync<T>(int type, Action<BinaryWriter> writeAction = n
         /// <typeparam name="T">Type of the result.</typeparam>
         /// <param name="type">The type code.</param>
         /// <param name="writeAction">The write action.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>Future for async operation</returns>
-        protected Future<T> DoOutOpObjectAsync<T>(int type, Action<BinaryWriter> writeAction)
+        protected Future<T> DoOutOpObjectAsync<T>(int type, Action<BinaryWriter> writeAction, bool keepBinary = false)
         {
             return GetFuture<T>((futId, futType) => DoOutOpObject(type, w =>
             {
                 writeAction(w);
                 w.WriteLong(futId);
                 w.WriteInt(futType);
-            }));
+            }, keepBinary), keepBinary);
         }
 
         /// <summary>
@@ -365,17 +405,18 @@ protected Future<T> DoOutOpObjectAsync<T>(int type, Action<BinaryWriter> writeAc
         /// <typeparam name="T1">The type of the first arg.</typeparam>
         /// <param name="type">The type code.</param>
         /// <param name="val1">First arg.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>
         /// Task for async operation
         /// </returns>
-        protected Task<TR> DoOutOpAsync<T1, TR>(int type, T1 val1)
+        protected Task<TR> DoOutOpAsync<T1, TR>(int type, T1 val1, bool keepBinary = false)
         {
             return GetFuture<TR>((futId, futType) => DoOutOp(type, w =>
             {
                 w.WriteObject(val1);
                 w.WriteLong(futId);
                 w.WriteInt(futType);
-            })).Task;
+            }, keepBinary), keepBinary).Task;
         }
 
         /// <summary>
@@ -387,10 +428,11 @@ protected Task<TR> DoOutOpAsync<T1, TR>(int type, T1 val1)
         /// <param name="type">The type code.</param>
         /// <param name="val1">First arg.</param>
         /// <param name="val2">Second arg.</param>
+        /// <param name="keepBinary">Keep binary flag.</param>
         /// <returns>
         /// Task for async operation
         /// </returns>
-        protected Task<TR> DoOutOpAsync<T1, T2, TR>(int type, T1 val1, T2 val2)
+        protected Task<TR> DoOutOpAsync<T1, T2, TR>(int type, T1 val1, T2 val2, bool keepBinary = false)
         {
             return GetFuture<TR>((futId, futType) => DoOutOp(type, w =>
             {
@@ -398,7 +440,7 @@ protected Task<TR> DoOutOpAsync<T1, T2, TR>(int type, T1 val1, T2 val2)
                 w.WriteObjectDetached(val2);
                 w.WriteLong(futId);
                 w.WriteInt(futType);
-            })).Task;
+            }, keepBinary), keepBinary).Task;
         }
 
         #endregion
@@ -468,31 +510,33 @@ private Future<T> GetFuture<T>(Func<long, int, IPlatformTargetInternal> listenAc
         private Future<T> GetFuture<T>(Action<long, int> listenAction, bool keepBinary = false,
             Func<BinaryReader, T> convertFunc = null)
         {
-            var futType = FutureType.Object;
+            return WithReg(() => {
+                var futType = FutureType.Object;
 
-            var type = typeof(T);
+                var type = typeof(T);
 
-            if (type.IsPrimitive)
-                IgniteFutureTypeMap.TryGetValue(type, out futType);
+                if (type.IsPrimitive)
+                    IgniteFutureTypeMap.TryGetValue(type, out futType);
 
-            var fut = convertFunc == null && futType != FutureType.Object
-                ? new Future<T>()
-                : new Future<T>(new FutureConverter<T>(_marsh, keepBinary, convertFunc));
+                var fut = convertFunc == null && futType != FutureType.Object
+                    ? new Future<T>()
+                    : new Future<T>(new FutureConverter<T>(_marsh, keepBinary, convertFunc));
 
-            var futHnd = _marsh.Ignite.HandleRegistry.Allocate(fut);
+                var futHnd = _marsh.Ignite.HandleRegistry.Allocate(fut);
 
-            try
-            {
-                listenAction(futHnd, (int)futType);
-            }
-            catch (Exception)
-            {
-                _marsh.Ignite.HandleRegistry.Release(futHnd);
+                try
+                {
+                    listenAction(futHnd, (int)futType);
+                }
+                catch (Exception)
+                {
+                    _marsh.Ignite.HandleRegistry.Release(futHnd);
 
-                throw;
-            }
+                    throw;
+                }
 
-            return fut;
+                return fut;
+            }, keepBinary); 
         }
 
         /// <summary>