diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java
index 21e2a8d..2e175ea 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/CorePluginsRepository.java
@@ -77,13 +77,14 @@
                       "",
                       pluginUrl.toString());
                 })
-            .orElse(
-                new PluginInfo(
-                    dropSuffix(entryName.getFileName().toString(), ".jar"),
-                    "",
-                    "",
-                    "",
-                    pluginUrl.toString()));
+            .orElseGet(
+                () ->
+                    new PluginInfo(
+                        dropSuffix(entryName.getFileName().toString(), ".jar"),
+                        "",
+                        "",
+                        "",
+                        pluginUrl.toString()));
       } catch (IOException e) {
         logger.atSevere().withCause(e).log("Unable to open plugin %s", pluginUrl);
         return null;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java
index 2260a65..76254a6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/repository/JenkinsCiPluginsRepository.java
@@ -119,7 +119,7 @@
     Optional<SmartJson> buildExecution = tryGetJson(url + "/api/json");
     Optional<JsonArray> artifacts =
         buildExecution.map(json -> json.get("artifacts").get().getAsJsonArray());
-    if (artifacts.orElse(new JsonArray()).size() == 0) {
+    if (artifacts.orElseGet(() -> new JsonArray()).size() == 0) {
       return Optional.empty();
     }