diff --git a/entitycache.module b/entitycache.module
index 1ba5998..c71ea02 100644
--- a/entitycache.module
+++ b/entitycache.module
@@ -307,6 +307,18 @@ function entitycache_entity_update($entity, $type) {
 }
 
 /**
+ * Implements hook_node_prepare().
+ *
+ * A user might change its name. Use user_node_load() to make
+ * sure the right name is passed on in the author field.
+ */
+function entitycache_node_prepare($node) {
+  if (!empty($node->nid)) {
+    user_node_load(array($node->nid => $node), array());
+  }
+}
+
+/**
  * Implements hook_entitycache_node_load().
  *
  * This forces book information to be added on each request, to avoid expensive