diff --git a/wp-includes/user.php b/wp-includes/user.php
index c1efcb6ea..ed5fa922b 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -15,12 +15,8 @@ function get_usernumposts($userid) {
 
 // TODO: xmlrpc only.  Maybe move to xmlrpc.php.
 function user_pass_ok($user_login,$user_pass) {
-	global $cache_userdata;
-	if ( empty($cache_userdata[$user_login]) ) {
-		$userdata = get_userdatabylogin($user_login);
-	} else {
-		$userdata = $cache_userdata[$user_login];
-	}
+	$userdata = get_userdatabylogin($user_login);
+
 	return (md5($user_pass) == $userdata->user_pass);
 }
 
diff --git a/wp-settings.php b/wp-settings.php
index de106f3aa..4d54777da 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -20,7 +20,7 @@ function wp_unregister_GLOBALS() {
 
 wp_unregister_GLOBALS();
 
-unset( $wp_filter, $cache_userdata, $cache_lastcommentmodified, $cache_lastpostdate, $cache_settings, $category_cache, $cache_categories );
+unset( $wp_filter, $cache_lastcommentmodified, $cache_lastpostdate );
 
 if ( ! isset($blog_id) )
 	$blog_id = 1;