diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index 3e701f4e3..6e584926a 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -58,10 +58,10 @@ typedef struct krb5_fcache{
 
 #define FCC_TAG_DELTATIME 1
 
-#define FILENAME(X) (((krb5_fcache*)(X)->data.data)->filename)
-
 #define FCACHE(X) ((krb5_fcache*)(X)->data.data)
 
+#define FILENAME(X) (FCACHE(X)->filename)
+
 static char*
 fcc_get_name(krb5_context context,
 	     krb5_ccache id)