--- Objects/typeobject.c.NEW	2008-05-27 22:26:18.000000000 +0200
+++ Objects/typeobject.c	2008-05-27 22:28:55.000000000 +0200
@@ -148,7 +148,7 @@
 	   cannot be done, 1 if Py_TPFLAGS_VALID_VERSION_TAG.
 	*/
 	Py_ssize_t i, n;
-	PyObject *bases;
+	PyObject *bases, *tmp;
 
 	if (PyType_HasFeature(type, Py_TPFLAGS_VALID_VERSION_TAG))
 		return 1;
@@ -167,9 +167,10 @@
 		   are borrowed reference */
 		for (i = 0; i < (1 << MCACHE_SIZE_EXP); i++) {
 			method_cache[i].value = NULL;
-			Py_XDECREF(method_cache[i].name);
-			method_cache[i].name = Py_None;
+			tmp = method_cache[i].name;
 			Py_INCREF(Py_None);
+			method_cache[i].name = Py_None;
+			Py_XDECREF(tmp);
 		}
 		/* mark all version tags as invalid */
 		PyType_Modified(&PyBaseObject_Type);
@@ -2254,7 +2255,7 @@
 _PyType_Lookup(PyTypeObject *type, PyObject *name)
 {
 	Py_ssize_t i, n;
-	PyObject *mro, *res, *base, *dict;
+	PyObject *mro, *res, *base, *dict, *tmp;
 	unsigned int h;
 
 	if (MCACHE_CACHEABLE_NAME(name) &&
@@ -2292,9 +2293,10 @@
 		h = MCACHE_HASH_METHOD(type, name);
 		method_cache[h].version = type->tp_version_tag;
 		method_cache[h].value = res;  /* borrowed */
+		tmp = method_cache[h].name;
 		Py_INCREF(name);
-		Py_DECREF(method_cache[h].name);
 		method_cache[h].name = name;
+		Py_DECREF(tmp);
 	}
 	return res;
 }