diff --git a/resources/sql/autopatches/20150506.calendarunnamedevents.1.php b/resources/sql/autopatches/20150506.calendarunnamedevents.1.php
index d6bdb1ab48..0b8c029584 100644
--- a/resources/sql/autopatches/20150506.calendarunnamedevents.1.php
+++ b/resources/sql/autopatches/20150506.calendarunnamedevents.1.php
@@ -1,33 +1,38 @@
 <?php
 
 echo "Retro-naming unnamed events.\n";
 
 $table = new PhabricatorCalendarEvent();
 $conn_w = $table->establishConnection('w');
 $iterator = new LiskMigrationIterator($table);
 foreach ($iterator as $event) {
   $id = $event->getID();
 
   if (strlen($event->getName()) == 0) {
     echo "Renaming event {$id}...\n";
     $viewer = PhabricatorUser::getOmnipotentUser();
-    $handle = id(new PhabricatorHandleQuery())
+
+    // NOTE: This uses PeopleQuery directly, instead of HandleQuery, to avoid
+    // performing cache fills as a side effect; the caches were added by a
+    // later patch. See T8209.
+    $user = id(new PhabricatorPeopleQuery())
       ->setViewer($viewer)
       ->withPHIDs(array($event->getUserPHID()))
       ->executeOne();
-    if ($handle->isComplete()) {
-      $new_name = $handle->getName();
+
+    if ($user) {
+      $new_name = $user->getUsername();
     } else {
       $new_name = pht('Unnamed Event');
     }
 
     queryfx(
       $conn_w,
       'UPDATE %T SET name = %s WHERE id = %d',
       $table->getTableName(),
       $new_name,
       $id);
   }
 }
 
 echo "Done.\n";