Index: /trunk/xcache.h
===================================================================
--- /trunk/xcache.h	(revision 658)
+++ /trunk/xcache.h	(revision 659)
@@ -104,6 +104,7 @@
 				: b->nKeyLength \
 				))
-#define BUCKET_KEY_S(b)    (UNISW((b)->arKey, (b)->key.arKey.s))
-#define BUCKET_KEY_U(b)    (UNISW((b)->arKey, (b)->key.arKey.u))
+#define BUCKET_KEY(b)      (UNISW((b)->arKey, (b)->key.arKey))
+#define BUCKET_KEY_S(b)    ZSTR_S(BUCKET_KEY(b))
+#define BUCKET_KEY_U(b)    ZSTR_U(BUCKET_KEY(b))
 #define BUCKET_KEY_TYPE(b) (UNISW(IS_STRING,  (b)->key.type))
 #ifdef IS_UNICODE