diff --git a/spring-session/src/main/java/org/springframework/session/MapSession.java b/spring-session/src/main/java/org/springframework/session/MapSession.java
index 4fb709c..96dfdf2 100644
--- a/spring-session/src/main/java/org/springframework/session/MapSession.java
+++ b/spring-session/src/main/java/org/springframework/session/MapSession.java
@@ -129,8 +129,9 @@ public final class MapSession implements ExpiringSession, Serializable {
 		return now - TimeUnit.SECONDS.toMillis(maxInactiveInterval) >= lastAccessedTime;
 	}
 
-	public Object getAttribute(String attributeName) {
-		return sessionAttrs.get(attributeName);
+	@SuppressWarnings("unchecked")
+	public <T> T getAttribute(String attributeName) {
+		return (T) sessionAttrs.get(attributeName);
 	}
 
 	public Set<String> getAttributeNames() {