diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ce2351893ba..9e804eae7c3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,9 +23,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16-16-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-16-16-yarn-lock-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16-16-yarn
+            ${{ runner.os }}-16-16-yarn-lock
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
       - name: Lint
@@ -47,9 +47,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-16-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-16-${{matrix.graphql_version}}-yarn-lock-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-16-${{matrix.graphql_version}}-yarn
+            ${{ runner.os }}-16-${{matrix.graphql_version}}-yarn-lock
       - name: Use GraphQL v${{matrix.graphql_version}}
         run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
       - name: Install Dependencies using Yarn
@@ -79,9 +79,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-lock-${{ hashFiles('yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn
+            ${{ runner.os }}-${{matrix.node_version}}-${{matrix.graphql_version}}-yarn-lock
       - name: Use GraphQL v${{matrix.graphql_version}}
         run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
       - name: Install Dependencies using Yarn
diff --git a/scripts/build-api-docs.js b/scripts/build-api-docs.js
index 2a7700a270b..f8a32dd21e0 100644
--- a/scripts/build-api-docs.js
+++ b/scripts/build-api-docs.js
@@ -13,16 +13,16 @@ async function buildApiDocs() {
   const outputDir = path.join(__dirname, '../website/docs/api');
   const sidebarsPath = path.join(__dirname, '../website/api-sidebar.json');
 
-  // Get the upstream git remote -- we don't want to assume it exists or is named "upstream"
-  const gitRemote = execSync('git remote -v', { encoding: 'utf-8' })
-    .split('\n')
-    .map(line => line.split('\t'))
-    .find(([_name, description]) => description.includes('(fetch)'));
-  const gitRemoteName = gitRemote && gitRemote[0];
-  if (!gitRemoteName) {
-    console.log('Unable to locate upstream git remote');
-    process.exit(1);
-  }
+  // // Get the upstream git remote -- we don't want to assume it exists or is named "upstream"
+  // const gitRemote = execSync('git remote -v', { encoding: 'utf-8' })
+  //   .split('\n')
+  //   .map(line => line.split('\t'))
+  //   .find(([_name, description]) => description.includes('(fetch)'));
+  // const gitRemoteName = gitRemote && gitRemote[0];
+  // if (!gitRemoteName) {
+  //   console.log('Unable to locate upstream git remote');
+  //   process.exit(1);
+  // }
 
   // An array of tuples where the first element is the package's name and the
   // the second element is the relative path to the package's entry point
@@ -65,7 +65,7 @@ async function buildApiDocs() {
     hideGenerator: true,
     hideBreadcrumbs: true,
     // skipSidebar: true,
-    gitRemote: gitRemoteName,
+    //gitRemote: gitRemoteName,
     gitRevision: 'master',
     tsconfig: path.resolve(__dirname, '../tsconfig.build.json'),
     entryPoints: modules.map(([_name, filePath]) => filePath),