Index: /branches/1.2/xcache.c
===================================================================
--- /branches/1.2/xcache.c	(revision 357)
+++ /branches/1.2/xcache.c	(revision 358)
@@ -680,4 +680,14 @@
 #define HASH_STR(s) HASH_STR_L(s, strlen(s) + 1)
 #define HASH_NUM(n) HASH(n)
+static inline xc_hash_value_t xc_hash_fold(xc_hash_value_t hvalue, const xc_hash_t *hasher) /* {{{ fold hash bits as needed */
+{
+	xc_hash_value_t folded = 0;
+	while (hvalue) {
+		folded ^= (hvalue & hasher->mask);
+		hvalue >>= hasher->bits;
+	}
+	return folded;
+}
+/* }}} */
 static inline xc_hash_value_t xc_entry_hash_name(xc_entry_t *xce TSRMLS_DC) /* {{{ */
 {
@@ -790,8 +800,7 @@
 
 	hv = xc_entry_hash_php(xce TSRMLS_CC);
-	cacheid = (hv & xc_php_hcache.mask);
+	cacheid = xc_hash_fold(hv, &xc_php_hcache);
 	xce->cache = xc_php_caches[cacheid];
-	hv >>= xc_php_hcache.bits;
-	xce->hvalue = (hv & xc_php_hentry.mask);
+	xce->hvalue = xc_hash_fold(hv, &xc_php_hentry);
 
 	xce->type = XC_TYPE_PHP;