sindresorhus
diff --git a/‎source/core/index.ts
Lines changed: 8 additions & 4 deletions b/‎source/core/index.ts
Lines changed: 8 additions & 4 deletions
diff --git a/‎test/cache.ts
Lines changed: 32 additions & 1 deletion b/‎test/cache.ts
Lines changed: 32 additions & 1 deletion
@@ -1324,16 +1324,17 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 			// `http-cache-semantics` checks this
 			delete (options as unknown as NormalizedOptions).url;
 
+			let request: ClientRequest;
+
 			// This is ugly
 			const cacheRequest = cacheableStore.get((options as any).cache)!(options, response => {
 				const typedResponse = response as unknown as IncomingMessageWithTimings & {req: ClientRequest};
-				const {req} = typedResponse;
 
 				// TODO: Fix `cacheable-response`
 				(typedResponse as any)._readableState.autoDestroy = false;
 
-				if (req) {
-					req.emit('cacheableResponse', typedResponse);
+				if (request) {
+					request.emit('cacheableResponse', typedResponse);
 				}
 
 				resolve(typedResponse as unknown as ResponseLike);
@@ -1343,7 +1344,10 @@ export default class Request extends Duplex implements RequestEvents<Request> {
 			(options as unknown as NormalizedOptions).url = url;
 
 			cacheRequest.once('error', reject);
-			cacheRequest.once('request', resolve);
+			cacheRequest.once('request', r => {
+				request = r;
+				resolve(r);
+			});
 		});
 	}
 
 
@@ -244,7 +244,7 @@ test('decompresses cached responses', withServer, async (t, server, got) => {
 		} else {
 			response.setHeader('content-encoding', 'gzip');
 			response.setHeader('cache-control', 'public, max-age=60');
-			response.setHeader('etag', 'foobar');
+			response.setHeader('etag', etag);
 			response.end(compressed);
 		}
 	});
@@ -310,3 +310,34 @@ test('does not hang on huge response', withServer, async (t, server, got) => {
 
 	t.is(body.length, bufferSize * times);
 });
+
+test('cached response ETag', withServer, async (t, server, got) => {
+	const etag = 'foobar';
+	const body = 'responseBody';
+
+	server.get('/', (request, response) => {
+		if (request.headers['if-none-match'] === etag) {
+			response.writeHead(304);
+			response.end();
+		} else {
+			response.writeHead(200, {ETag: etag});
+			response.end(body);
+		}
+	});
+
+	const cache = new Map();
+
+	const originalResponse = await got({cache});
+
+	t.false(originalResponse.isFromCache);
+	t.is(originalResponse.body, body);
+
+	await delay(100); // Added small delay in order to wait the cache to be populated
+
+	t.is(cache.size, 1);
+
+	const cachedResponse = await got({cache});
+
+	t.true(cachedResponse.isFromCache);
+	t.is(cachedResponse.body, body);
+});