diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/cache/EiffelEventIdCacheImpl.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/cache/EiffelEventIdCacheImpl.java
index 3bc237d..5377521 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/cache/EiffelEventIdCacheImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/cache/EiffelEventIdCacheImpl.java
@@ -94,7 +94,11 @@
   }
 
   private Optional<UUID> getEventIdIfPresent(EventKey key) {
-    return Optional.ofNullable(eventIds.getIfPresent(key)).map(Optional::get);
+    Optional<UUID> fromCache = eventIds.getIfPresent(key);
+    if (fromCache == null) {
+      return Optional.empty();
+    }
+    return fromCache;
   }
 
   @Override