killbill-memoizeit

diff --git a/util/src/main/java/com/ning/billing/util/dao/AuditLogMapper.java b/util/src/main/java/com/ning/billing/util/dao/AuditLogMapper.java
index 89ca281..188ea71 100644
--- a/util/src/main/java/com/ning/billing/util/dao/AuditLogMapper.java
+++ b/util/src/main/java/com/ning/billing/util/dao/AuditLogMapper.java
@@ -41,10 +41,10 @@ public class AuditLogMapper extends MapperBase implements ResultSetMapper<AuditL
         final String changedBy = r.getString("changed_by");
         final String reasonCode = r.getString("reason_code");
         final String comments = r.getString("comments");
-        final String userToken = r.getString("user_token");
+        final UUID userToken = getUUID(r, "user_token");
 
         final EntityAudit entityAudit = new EntityAudit(TableName.valueOf(tableName), recordId, ChangeType.valueOf(changeType));
-        final CallContext callContext = new DefaultCallContext(changedBy, changeDate, reasonCode, comments, UUID.fromString(userToken));
+        final CallContext callContext = new DefaultCallContext(changedBy, changeDate, reasonCode, comments, userToken);
         return new DefaultAuditLog(entityAudit, callContext);
     }
 }