diff --git a/kcm/cache.c b/kcm/cache.c
index 8def1c5d7..6f46cd9fa 100644
--- a/kcm/cache.c
+++ b/kcm/cache.c
@@ -484,12 +484,12 @@ kcm_ccache_store_cred(krb5_context context,
 struct kcm_creds *
 kcm_ccache_find_cred_uuid(krb5_context context,
 			  kcm_ccache ccache,
-			  uuid_t uuid)
+			  kcmuuid_t uuid)
 {
     struct kcm_creds *c;
 
     for (c = ccache->creds; c != NULL; c = c->next)
-	if (uuid_compare(c->uuid, uuid) == 0)
+	if (memcmp(c->uuid, uuid, sizeof(c->uuid)) == 0)
 	    return c;
 
     return NULL;
@@ -515,7 +515,7 @@ kcm_ccache_store_cred_internal(krb5_context context,
 	return KRB5_CC_NOMEM;
     }
 
-    uuid_generate((*c)->uuid);
+    RAND_bytes((*c)->uuid, sizeof((*c)->uuid));
 
     *credp = &(*c)->cred;