diff --git a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java
index 351ba054d..9ad8df12c 100644
--- a/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java
+++ b/powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/cache/DataStore.java
@@ -46,7 +46,8 @@ public void remove(String Key){
     }
 
     public Object get(String key) {
-        return store.containsKey(key)?store.get(key).value:null;
+        ValueNode node = store.get(key);
+        return node != null ? node.value : null;
     }
 
     public boolean hasExpired(String key, Instant now) {
diff --git a/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java b/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java
index 04903da6c..c2d1babf7 100644
--- a/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java
+++ b/powertools-sqs/src/main/java/software/amazon/lambda/powertools/sqs/internal/BatchContext.java
@@ -111,7 +111,7 @@ private <T> void processFailedMessages(List<T> successReturns,
                     map(SQSMessage::getMessageId)
                     .collect(toList());
 
-            LOG.debug(format("[%s] records failed processing, but exceptions are suppressed. " +
+            LOG.debug(format("[%d] records failed processing, but exceptions are suppressed. " +
                     "Failed messages %s", failedMessages.size(), messageIds));
         } else {
             throw new SQSBatchProcessingException(exceptions, failedMessages, successReturns);
diff --git a/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java b/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java
index 83f34ebfd..db89a1bbc 100644
--- a/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java
+++ b/powertools-validation/src/main/java/software/amazon/lambda/powertools/validation/ValidationUtils.java
@@ -229,12 +229,6 @@ public static JsonSchema getJsonSchema(String schema) {
      * @return the loaded json schema
      */
     public static JsonSchema getJsonSchema(String schema, boolean validateSchema) {
-        JsonSchema jsonSchema = schemas.get(schema);
-
-        if (jsonSchema != null) {
-            return jsonSchema;
-        }
-
         if (schema.startsWith(CLASSPATH)) {
             String filePath = schema.substring(CLASSPATH.length());
             try (InputStream schemaStream = ValidationAspect.class.getResourceAsStream(filePath)) {
@@ -260,7 +254,7 @@ public static JsonSchema getJsonSchema(String schema, boolean validateSchema) {
             }
         }
 
-        schemas.put(schema, jsonSchema);
+        schemas.putIfAbsent(schema, jsonSchema);
 
         return jsonSchema;
     }