diff --git a/.travis.yml b/.travis.yml
index 7bedf9d8b7..d1c217ad69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,6 +80,7 @@ jobs:
               name: built_libs_cache
               paths:
                 - "$BUILT_LIBS_DIR"
+                - "$NODE_MODULES_DIR"                
             use: node_modules_cache
 
         - stage: "Build lib"
@@ -100,44 +101,43 @@ jobs:
                   paths:
                       - "$DEMO_SHELL_DIR"
               use:
-                  - node_modules_cache
                   - built_libs_cache
 
         - stage: "Build"
           name: "content::unit"
           script:  ./scripts/travis/unit-test/content.sh
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Build"
           name: "core-extension::unit"
           script: ./scripts/travis/unit-test/core-extension.sh
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Build"
           name: "process-insights::unit"
           script: ./scripts/travis/unit-test/process.sh
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Build"
           name: "process-cloud::unit"
           script: ./scripts/travis/unit-test/process-cloud.sh
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Trigger Alpha ADF child build"
           name: "Trigger Alpha ADF child build"
           script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v alpha
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Trigger Beta ADF child build"
           name: "Trigger Beta ADF child build"
           script: ./scripts/travis/update/update-project.sh -p $TRAVIS_BUILD_NUMBER -t $GITHUB_TOKEN -v beta
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
         - stage: "Release tag"
           script: ./scripts/travis/release/git-tag.sh
@@ -152,7 +152,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
 
@@ -166,7 +165,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -181,7 +179,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -196,7 +193,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -211,7 +207,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -226,7 +221,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -241,7 +235,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
 
@@ -255,7 +248,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -271,7 +263,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -287,7 +278,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -303,7 +293,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -319,9 +308,7 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
-              - smartrunner-cache-process-cloud
               - built_demo_shell_cache
           env:
               - CONTEXT_ENV="process-services-cloud/form-field"
@@ -336,9 +323,7 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
-              - smartrunner-cache-process-cloud
               - built_demo_shell_cache
           env:
               - CONTEXT_ENV="process-services-cloud/people"
@@ -353,9 +338,7 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
-              - smartrunner-cache-process-cloud
               - built_demo_shell_cache
           env:
               - CONTEXT_ENV="process-services-cloud/process"
@@ -370,9 +353,7 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
-              - smartrunner-cache-process-cloud
               - built_demo_shell_cache
           env:
               - CONTEXT_ENV="process-services-cloud/start-task"
@@ -387,7 +368,6 @@ jobs:
           after_script: ./scripts/ci/job_hooks/after_e2e.sh
           workspaces:
             use:
-              - node_modules_cache
               - built_libs_cache
               - built_demo_shell_cache
           env:
@@ -398,7 +378,7 @@ jobs:
           - ADF_VERSION=$(npm view @alfresco/adf-core@${TAG_NPM} version)
           - ./scripts/travis/build/npm-check-bundles.sh -v ${ADF_VERSION}
           workspaces:
-            use: node_modules_cache
+            use: built_libs_cache
 
 notifications:
   slack: