diff --git a/cache.c b/cache.c
index 8a0c9d798..61d39e060 100644
--- a/cache.c
+++ b/cache.c
@@ -5,8 +5,8 @@
 void krb5_free_ccache(krb5_context context,
 		      krb5_ccache val)
 {
-  free(((krb5_fcache*)(val->data))->filename);
-  free(val->data);
+  free(((krb5_fcache*)(val->data.data))->filename);
+  krb5_data_free (&val->data);
   free(val);
 }
 
diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index 8a0c9d798..61d39e060 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -5,8 +5,8 @@
 void krb5_free_ccache(krb5_context context,
 		      krb5_ccache val)
 {
-  free(((krb5_fcache*)(val->data))->filename);
-  free(val->data);
+  free(((krb5_fcache*)(val->data.data))->filename);
+  krb5_data_free (&val->data);
   free(val);
 }