Index: trunk/xcache.h
===================================================================
--- trunk/xcache.h	(revision 191)
+++ trunk/xcache.h	(revision 200)
@@ -48,7 +48,7 @@
 				: b->nKeyLength \
 				))
-#define BUCKET_KEY(b)  (UNISW((b)->arKey, (b)->key.arKey.s))
-#define BUCKET_UKEY(b) (UNISW((b)->arKey, (b)->key.arKey.u))
-#define BUCKET_KEY_TYPE(b) (UNISW(0, (b)->key.type))
+#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_TYPE(b) (UNISW(IS_STRING,  (b)->key.type))
 #ifdef IS_UNICODE
 #	define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, key.arKey)
@@ -95,4 +95,7 @@
  	   zend_hash_find(ht, arKey, nKeyLength, pData)
 
+#	define zend_u_hash_quick_find(ht, type, arKey, nKeyLength, h, pData) \
+ 	   zend_hash_quick_find(ht, arKey, nKeyLength, h, pData)
+
 #	define add_u_assoc_zval_ex(arg, type, key, key_len, value) \
 		add_assoc_zval_ex(arg, key, key_len, value)