diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9c28b33cfd19..2e5454dba410 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,15 +1,15 @@
 aliases:
   - &restore-cache
     keys:
-      - dependencies-{{ .Branch }}-{{ checksum "package.json" }}
+      - v1-dependencies-{{ .Branch }}-{{ "yarn.lock" }}
       # Fallback in case checksum fails
-      - dependencies-{{ .Branch }}-
+      - v1-dependencies-{{ .Branch }}-
 
   - &save-cache
     paths:
       - node_modules
       - website/node_modules
-    key: dependencies-{{ .Branch }}-{{ checksum "package.json" }}
+    key: v1-dependencies-{{ .Branch }}-{{ "yarn.lock" }}
 
   - &yarn-install
     run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd5b84b9c16..a1b750e27d4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,9 @@
 
 ### Features
 
-* `[jest-jasmine2]` Adds error throwing and descriptive errors to `it`/ `test` 
-  for invalid arguements. `[jest-circus]` Adds error throwing and descriptive 
-  errors to `it`/ `test` for invalid arguements. 
+* `[jest-jasmine2]` Adds error throwing and descriptive errors to `it`/ `test`
+  for invalid arguements. `[jest-circus]` Adds error throwing and descriptive
+  errors to `it`/ `test` for invalid arguements.
 * `[jest-matcher-utils]` Add `isNot` option to `matcherHint` function
   ([#5512](https://github.com/facebook/jest/pull/5512))
 
diff --git a/packages/jest-editor-support/src/__tests__/settings.test.js b/packages/jest-editor-support/src/__tests__/settings.test.js
index fa471810dcd3..f84e24c41161 100644
--- a/packages/jest-editor-support/src/__tests__/settings.test.js
+++ b/packages/jest-editor-support/src/__tests__/settings.test.js
@@ -151,8 +151,11 @@ describe('Settings', () => {
       on: () => {},
       stdout: new EventEmitter(),
     });
-    const spawnOptions = {shell: true};
-    const options: any = Object.assign({}, createProcess, spawnOptions);
+
+    const options: any = {
+      createProcess,
+      shell: true,
+    };
     const settings = new Settings(workspace, options);
     settings.getConfig(() => {});
 
@@ -164,7 +167,7 @@ describe('Settings', () => {
         rootPath,
       },
       ['--showConfig'],
-      spawnOptions,
+      {shell: true},
     );
   });
 });