diff --git a/src/main/java/net/helenus/core/cache/MapCache.java b/src/main/java/net/helenus/core/cache/MapCache.java
index 72c0326..a9b13e7 100644
--- a/src/main/java/net/helenus/core/cache/MapCache.java
+++ b/src/main/java/net/helenus/core/cache/MapCache.java
@@ -390,7 +390,10 @@ public class MapCache<K, V> implements Cache<K, V> {
   @Override
   @SuppressWarnings("unchecked")
   public <T> T unwrap(Class<T> clazz) {
-    return (T) map;
+    if (Map.class.isAssignableFrom(clazz)) {
+        return (T) map;
+    }
+    return null;
   }
 
   /** {@inheritDoc} */