diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 0dd786bc3..45f1139fb 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -290,7 +290,7 @@ resources:
 ########################################################################################
 jobs:
 - name: concourse-ls-tests
-  max_in_flight: 4
+  max_in_flight: 6
   plan:
   - get: every-minute
     trigger: true
diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
index 0ce2141be..6088fcfac 100644
--- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
+++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/schema/YTypeFactory.java
@@ -373,12 +373,13 @@ public class YTypeFactory {
 
 		public Map<String, YTypedProperty> getPropertiesMap() {
 			if (cachedPropertyMap==null) {
-				cachedPropertyMap = new LinkedHashMap<>();
+				ImmutableMap.Builder<String, YTypedProperty> builder = ImmutableMap.builder();
 				for (YTypedProperty p : propertyList) {
-					cachedPropertyMap.put(p.getName(), p);
+					builder.put(p.getName(), p);
 				}
+				cachedPropertyMap = builder.build();
 			}
-			return Collections.unmodifiableMap(cachedPropertyMap);
+			return cachedPropertyMap;
 		}
 
 		public boolean isAtomic() {