diff --git a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
index 7776b79..a6403c7 100644
--- a/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
+++ b/src/main/java/org/apache/sling/scripting/freemarker/internal/FreemarkerScriptEngineFactory.java
@@ -146,10 +146,8 @@
             final String namespace = (String) serviceReference.getProperty("namespace");
             final String name = (String) serviceReference.getProperty("name");
             if (StringUtils.isNotBlank(namespace) && StringUtils.isNotBlank(name)) {
-                if (!models.containsKey(namespace)) {
-                    models.put(namespace, new HashMap<>());
-                }
-                models.get(namespace).put(name, bundleContext.getService(serviceReference));
+                final Map<String, TemplateModel> map = models.computeIfAbsent(namespace, k -> new HashMap<>());
+                map.put(name, bundleContext.getService(serviceReference));
             }
         }
         return models;