diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
index 633cb5f..0ccc648 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewnotes/CreateReviewNotes.java
@@ -277,14 +277,14 @@
               type,
               a.getValue(),
               a.getAccountId(),
-              accountCache.maybeGet(a.getAccountId()).map(AccountState::getAccount));
+              accountCache.get(a.getAccountId()).map(AccountState::getAccount));
         }
       }
     }
     if (submit != null) {
       fmt.appendSubmittedBy(
           submit.getAccountId(),
-          accountCache.maybeGet(submit.getAccountId()).map(AccountState::getAccount));
+          accountCache.get(submit.getAccountId()).map(AccountState::getAccount));
       fmt.appendSubmittedAt(submit.getGranted());
     }
     if (canonicalWebUrl != null) {