diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java
index 5b4a7f1..77374a4 100644
--- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java
+++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java
@@ -155,13 +155,7 @@ public abstract class GemFireUtils {
 	 * @see org.apache.geode.cache.client.ClientRegionShortcut
 	 */
 	public static boolean isProxy(ClientRegionShortcut shortcut) {
-
-		switch (shortcut) {
-			case PROXY:
-				return true;
-			default:
-				return false;
-		}
+		return ClientRegionShortcut.PROXY.equals(shortcut);
 	}
 
 	/**
@@ -172,6 +166,7 @@ public abstract class GemFireUtils {
 	 * @see org.apache.geode.cache.DataPolicy
 	 * @see org.apache.geode.cache.Region
 	 */
+	@SuppressWarnings("rawtypes")
 	public static boolean isProxy(Region<?, ?> region) {
 
 		RegionAttributes regionAttributes = region.getAttributes();