Index: src/wp-includes/ms-functions.php
===================================================================
--- src/wp-includes/ms-functions.php	(revision 45273)
+++ src/wp-includes/ms-functions.php	(working copy)
@@ -206,7 +206,7 @@
 	 * @param int    $blog_id Blog ID.
 	 */
 	do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-	wp_cache_delete( $user_id, 'users' );
+	clean_user_cache( $user_id );
 	wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
 	restore_current_blog();
 	return true;
Index: src/wp-includes/pluggable.php
===================================================================
--- src/wp-includes/pluggable.php	(revision 45273)
+++ src/wp-includes/pluggable.php	(working copy)
@@ -1972,7 +1972,7 @@
 		}
 		$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
 		$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
-
+		clean_user_cache( $user );
 		$switched_locale = switch_to_locale( get_user_locale( $user ) );
 
 		/* translators: %s: user login */
@@ -2504,7 +2504,7 @@
 			array( 'ID' => $user_id )
 		);
 
-		wp_cache_delete( $user_id, 'users' );
+		clean_user_cache( $user_id );
 	}
 endif;
 
Index: src/wp-includes/user.php
===================================================================
--- src/wp-includes/user.php	(revision 45273)
+++ src/wp-includes/user.php	(working copy)
@@ -1830,8 +1830,8 @@
 	} elseif ( ! $update ) {
 		$user->set_role( get_option( 'default_role' ) );
 	}
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $user_login, 'userlogins' );
+
+	clean_user_cache( $user_id );
 
 	if ( $update ) {
 		/**
@@ -1935,8 +1935,7 @@
 		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
 	}
 
-	wp_cache_delete( $user['user_email'], 'useremail' );
-	wp_cache_delete( $user['user_nicename'], 'userslugs' );
+	clean_user_cache( $user_obj );
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$userdata = array_merge( $user, $userdata );