diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index 0796e812c98c8bdcfe9cd8b4f9932a9f2dccb422..f6fbf8053f859a0a8d835a4f36420b17240e7230 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -106,7 +106,7 @@ public class User extends AbstractModelObject {
     public <T extends UserProperty> T getProperty(Class<T> clazz) {
         for (UserProperty p : properties) {
             if(clazz.isInstance(p))
-                return (T)p;    // can't use Class.cast as that's 5.0 feature
+                return clazz.cast(p);
         }
         return null;
     }