diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
index 795d127b4..260a02968 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
@@ -960,7 +960,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 				}
 			}, true);
 
-			return deserializeHashValue(rawHashValue);
+			return (HV) deserializeHashValue(rawHashValue);
 		}
 
 		@Override
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java
index 1741e38e5..a9edfc0aa 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/serializer/SimpleRedisSerializer.java
@@ -31,8 +31,8 @@ public class SimpleRedisSerializer implements RedisSerializer<Object> {
 	private Converter<Object, byte[]> serializer = new SerializingConverter();
 	private Converter<byte[], Object> deserializer = new DeserializingConverter();
 
-	private sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
-	private sun.misc.BASE64Decoder decoder = new sun.misc.BASE64Decoder();
+	//	private sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
+	//	private sun.misc.BASE64Decoder decoder = new sun.misc.BASE64Decoder();
 
 	@SuppressWarnings("unchecked")
 	@Override
diff --git a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java
index 857f271ff..5ad668e4f 100644
--- a/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java
+++ b/spring-data-redis/src/test/java/org/springframework/data/keyvalue/redis/util/AbstractRedisMapTests.java
@@ -343,4 +343,9 @@ public abstract class AbstractRedisMapTests<K, V> {
 		assertEquals(3, values.size());
 		assertThat(values, hasItems(v1, v2, v3));
 	}
+
+	@Test(expected = UnsupportedOperationException.class)
+	public void testEntrySet() {
+		map.entrySet();
+	}
 }
\ No newline at end of file