diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 01a2b51272..3513468176 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -84,7 +84,10 @@ jobs:
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ~/.npm
-          key: ${{ runner.OS }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.OS }}-${{ matrix.node-version }}-${{ matrix.webpack-version }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.OS }}-${{ matrix.node-version }}-${{ matrix.webpack-version }}-
+            ${{ runner.OS }}-
 
       - name: Install dependencies
         if: steps.cache.outputs.cache-hit != 'true'
diff --git a/lib/Server.js b/lib/Server.js
index 7fdaa68d23..c464770c5d 100644
--- a/lib/Server.js
+++ b/lib/Server.js
@@ -34,8 +34,8 @@ const setupExitSignals = require('./utils/setupExitSignals');
 const findPort = require('./utils/findPort');
 const schema = require('./options.json');
 
-if (!process.env.WEBPACK_DEV_SERVER) {
-  process.env.WEBPACK_DEV_SERVER = true;
+if (!process.env.WEBPACK_SERVE) {
+  process.env.WEBPACK_SERVE = true;
 }
 
 class Server {
diff --git a/test/server/Server.test.js b/test/server/Server.test.js
index 838dc3ad48..e7122afddf 100644
--- a/test/server/Server.test.js
+++ b/test/server/Server.test.js
@@ -164,7 +164,7 @@ describe('Server', () => {
     });
   });
 
-  describe('WEBPACK_DEV_SERVER environment variable', () => {
+  describe('WEBPACK_SERVE environment variable', () => {
     const OLD_ENV = process.env;
 
     beforeEach(() => {
@@ -173,7 +173,7 @@ describe('Server', () => {
 
       process.env = { ...OLD_ENV };
 
-      delete process.env.WEBPACK_DEV_SERVER;
+      delete process.env.WEBPACK_SERVE;
     });
 
     afterEach(() => {
@@ -181,11 +181,11 @@ describe('Server', () => {
     });
 
     it('should be present', () => {
-      expect(process.env.WEBPACK_DEV_SERVER).toBeUndefined();
+      expect(process.env.WEBPACK_SERVE).toBeUndefined();
 
       require('../../lib/Server');
 
-      expect(process.env.WEBPACK_DEV_SERVER).toBe(true);
+      expect(process.env.WEBPACK_SERVE).toBe(true);
     });
   });
 });