diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
index 5c00873e1d..0dd8ed33d5 100644
--- a/src/applications/paste/query/PhabricatorPasteQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
@@ -199,7 +199,7 @@ final class PhabricatorPasteQuery
       $key = $this->getContentCacheKey($paste);
       if (isset($caches[$key])) {
         $paste->attachContent(phutil_safe_html($caches[$key]));
-        $results[$key] = $paste;
+        $results[$paste->getID()] = $paste;
       } else {
         $need_raw[$key] = $paste;
       }
@@ -217,7 +217,7 @@ final class PhabricatorPasteQuery
       $paste->attachContent($content);
 
       $write_data[$this->getContentCacheKey($paste)] = (string)$content;
-      $results[$key] = $paste;
+      $results[$paste->getID()] = $paste;
     }
 
     $cache->setKeys($write_data);