Index: kernel/generic/include/adt/cht.h
===================================================================
--- kernel/generic/include/adt/cht.h	(revision 26d8df3ecde04604978e57940c1eb659ab53b8a6)
+++ kernel/generic/include/adt/cht.h	(revision bc216a07a86e40d74455b7f4d6fb8f65e195443d)
@@ -46,6 +46,13 @@
 /** Concurrent hash table node link. */
 typedef struct cht_link {
-	/* Must be placed first. */
-	rcu_item_t rcu_link;
+	/* Must be placed first. 
+	 * 
+	 * The function pointer (rcu_link.func) is used to store the item's 
+	 * memoized hash.
+	 */
+	union {
+		rcu_item_t rcu_link;
+		size_t hash;
+	};
 	/** Link to the next item in the bucket including any marks. */
 	cht_ptr_t link;
@@ -71,8 +78,9 @@
 	cht_ops_t *op;
 	
-	size_t min_order;
 	cht_buckets_t *b;
 	cht_buckets_t *new_b;
+	size_t invalid_hash;
 
+	size_t min_order;
 	size_t max_load;
 	work_t resize_work;