diff --git a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
index 1eec141b..b747148d 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/DependenciesResolver.groovy
@@ -65,7 +65,7 @@ class DependenciesResolver {
 
         if (cachingEnabled) {
           steps.dir(this.workspace) {
-            steps.cache(maxCacheSize: 512, caches: [[$class: 'ArbitraryFileCache', includes: '**/*', path: '.npm-cache']]) {
+            steps.cache(maxCacheSize: 512, caches: [[$class: 'ArbitraryFileCache', includes: '**/*', path: '.npm-cache', cacheValidityDecidingFile: 'package-lock.json']]) {
               steps.sh "npm install --cache .npm-cache"
             }
           }
@@ -87,7 +87,7 @@ class DependenciesResolver {
 
         if (cachingEnabled) {
           steps.dir(this.workspace) {
-            steps.cache(maxCacheSize: 512, caches: [[$class: 'ArbitraryFileCache', includes: '**/*', path: '.yarn-cache']]) {
+            steps.cache(maxCacheSize: 512, caches: [[$class: 'ArbitraryFileCache', includes: '**/*', path: '.yarn-cache', cacheValidityDecidingFile: 'yarn.lock']]) {
               steps.sh "yarn install --cache-folder .yarn-cache"
             }
           }
diff --git a/first-class-pipeline/src/com/freeleaps/devops/lint/ESLint.groovy b/first-class-pipeline/src/com/freeleaps/devops/lint/ESLint.groovy
index b954e558..52c96047 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/lint/ESLint.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/lint/ESLint.groovy
@@ -23,6 +23,12 @@ class ESLint extends LinterBase {
     steps.dir(workspace) {
       steps.log.info("${linterType.linter}", "Install eslint dependencies...")
       steps.sh("npm install -g ${deps.join(' ')}")
+      // check if given config file is not end with .json
+      if (!configs.endsWith('.json')) {
+        steps.log.warn("${linterType.linter}", "Invalid eslint configuration file, must be a JSON file, convert file as valid JSON file...")
+        steps.sh("mv ${configs} ${configs}.json")
+        configs = "${configs}.json"
+      }
       steps.log.info("${linterType.linter}", "Running eslint...")
       steps.sh("eslint --config ${configs} ${workspace}")
     }