From 751bbb80d256027de942e9ba4dc71246ed5122ba Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 2 Jun 2021 14:16:54 +1000
Subject: [PATCH] Add option to disable showing of cached detections

---
 .../webextension/_locales/ca/messages.json    |  1 +
 .../webextension/_locales/de/messages.json    |  1 +
 .../webextension/_locales/el/messages.json    |  1 +
 .../webextension/_locales/en/messages.json    |  1 +
 .../webextension/_locales/es/messages.json    |  1 +
 .../webextension/_locales/fa/messages.json    |  1 +
 .../webextension/_locales/fr/messages.json    |  1 +
 .../webextension/_locales/gl_ES/messages.json |  1 +
 .../webextension/_locales/gr/messages.json    |  1 +
 .../webextension/_locales/id/messages.json    |  1 +
 .../webextension/_locales/it/messages.json    |  1 +
 .../webextension/_locales/ja/messages.json    |  1 +
 .../webextension/_locales/ko/messages.json    |  1 +
 .../webextension/_locales/pl/messages.json    |  1 +
 .../webextension/_locales/pt/messages.json    |  1 +
 .../webextension/_locales/pt_BR/messages.json |  1 +
 .../webextension/_locales/ro/messages.json    |  1 +
 .../webextension/_locales/ru/messages.json    |  1 +
 .../webextension/_locales/sk/messages.json    |  1 +
 .../webextension/_locales/tr/messages.json    |  1 +
 .../webextension/_locales/uk/messages.json    |  1 +
 .../webextension/_locales/uz/messages.json    |  1 +
 .../webextension/_locales/zh_CN/messages.json |  1 +
 .../webextension/_locales/zh_TW/messages.json |  1 +
 src/drivers/webextension/html/options.html    |  6 ++
 src/drivers/webextension/js/driver.js         | 65 ++++++++++++++-----
 src/drivers/webextension/js/options.js        |  1 +
 src/drivers/webextension/js/popup.js          |  2 +-
 src/wappalyzer.js                             |  9 ++-
 29 files changed, 86 insertions(+), 21 deletions(-)

diff --git a/src/drivers/webextension/_locales/ca/messages.json b/src/drivers/webextension/_locales/ca/messages.json
index 810f87238..795b39501 100644
--- a/src/drivers/webextension/_locales/ca/messages.json
+++ b/src/drivers/webextension/_locales/ca/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Enviar les tecnologies identificades de forma anònima a wappalyzer.com" },
   "optionThemeMode":          { "message": "Habilitar la compatibilitat de l'aspecte fosc" },
 	"optionBadge":              { "message": "Mostrar el nombre de tecnologies identificades en la icona" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Desactivar en aquest web" },
 	"clearCache":               { "message": "Esborrar la memòria cau de les deteccions" },
 	"nothingToDo":              { "message": "Res a fer aquí." },
diff --git a/src/drivers/webextension/_locales/de/messages.json b/src/drivers/webextension/_locales/de/messages.json
index 9f4e43a49..f0e07628a 100644
--- a/src/drivers/webextension/_locales/de/messages.json
+++ b/src/drivers/webextension/_locales/de/messages.json
@@ -10,6 +10,7 @@
   "optionTracking":           { "message": "Anonyme Statistiken an wappalyzer.com übermitteln" },
   "optionThemeMode":          { "message": "Dunkel-Modus aktivieren" },
   "optionBadge":              { "message": "Anzahl der identifizierten Optionen am Icon anzeigen" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
   "disableOnDomain":          { "message": "Auf dieser Website deaktivieren" },
   "clearCache":               { "message": "Cache leeren" },
   "nothingToDo":              { "message": "Nichts zu tun." },
diff --git a/src/drivers/webextension/_locales/el/messages.json b/src/drivers/webextension/_locales/el/messages.json
index 16acac67e..d98a7a780 100644
--- a/src/drivers/webextension/_locales/el/messages.json
+++ b/src/drivers/webextension/_locales/el/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
 	"optionThemeMode":          { "message": "Ενεργοποίηση συμβατότητας σκοτεινό τρόπο." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index d111f3d52..bd00e4162 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Anonymously send identified technologies to wappalyzer.com" },
 	"optionThemeMode":          { "message": "Enable dark mode compatibility" },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nothing to do here." },
diff --git a/src/drivers/webextension/_locales/es/messages.json b/src/drivers/webextension/_locales/es/messages.json
index cc29fd782..591e76dd5 100644
--- a/src/drivers/webextension/_locales/es/messages.json
+++ b/src/drivers/webextension/_locales/es/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Enviar informes anónimos sobre las aplicaciones detectadas a wappalyzer.com para análisis" },
 	"optionThemeMode":          { "message": "Habilitar la compatibilidad del modo oscuro." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nada que hacer aquí." },
diff --git a/src/drivers/webextension/_locales/fa/messages.json b/src/drivers/webextension/_locales/fa/messages.json
index 609605382..68b3f30f8 100644
--- a/src/drivers/webextension/_locales/fa/messages.json
+++ b/src/drivers/webextension/_locales/fa/messages.json
@@ -11,6 +11,7 @@
   "optionThemeMode":          { "message": "فعال کردن حالت سازگاری تاریک." },
 	"nothingToDo":              { "message": "هیچ چیز برای انجام اینجا نیست." },
 	"optionBadge":              { "message": "نمایش تعداد فناوری های شناسایی شده روی آیکون" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "غیرفعال کردن در این وبسایت" },
 	"clearCache":               { "message": "پاکسازی شناسایی های کش شده" },
 	"noAppsDetected":           { "message": "هیچ فن‌آوری شناسایی نشده است." },
diff --git a/src/drivers/webextension/_locales/fr/messages.json b/src/drivers/webextension/_locales/fr/messages.json
index 4e738725b..e2d6f2774 100644
--- a/src/drivers/webextension/_locales/fr/messages.json
+++ b/src/drivers/webextension/_locales/fr/messages.json
@@ -10,6 +10,7 @@
 	"optionsSave":              { "message": "Sauvegarder les options" },
 	"optionsSaved":             { "message": "Sauvegardé" },
 	"optionBadge":              { "message": "Montrer le nombre de technologies identifiées sur l'icône" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Désactiver sur ce site web" },
 	"clearCache":               { "message": "Effacer les détections mises en cache" },
 	"twitter":                  { "message": "Suivre Wappalyzer sur Twitter" },
diff --git a/src/drivers/webextension/_locales/gl_ES/messages.json b/src/drivers/webextension/_locales/gl_ES/messages.json
index 597ab27ca..13330b086 100644
--- a/src/drivers/webextension/_locales/gl_ES/messages.json
+++ b/src/drivers/webextension/_locales/gl_ES/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Envía anonimamente aplicativos identificados a wappalyzer.com" },
   "optionThemeMode":          { "message": "Permitir a compatibilidade modo escuro." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nada que facer por aquí." },
diff --git a/src/drivers/webextension/_locales/gr/messages.json b/src/drivers/webextension/_locales/gr/messages.json
index 7d0cf61de..a42fa8e5b 100644
--- a/src/drivers/webextension/_locales/gr/messages.json
+++ b/src/drivers/webextension/_locales/gr/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Ανώνυμη αποστολή αναφορών για εντοπισμένες εφαρμογές στο wappalyzer.com για έρευνα" },
   "optionThemeMode":          { "message": "Ενεργοποίηση συμβατότητας σκοτεινό τρόπο." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Καμία ενέργεια." },
diff --git a/src/drivers/webextension/_locales/id/messages.json b/src/drivers/webextension/_locales/id/messages.json
index 2892b200b..878237f49 100644
--- a/src/drivers/webextension/_locales/id/messages.json
+++ b/src/drivers/webextension/_locales/id/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Secara anonim kirimkan laporan tentang aplikasi yang terdeteksi ke wappalyzer.com untuk penelitian" },
   "optionThemeMode":          { "message": "Aktifkan kompatibilitas modus gelap." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Tak ada yang dilakukan disini." },
diff --git a/src/drivers/webextension/_locales/it/messages.json b/src/drivers/webextension/_locales/it/messages.json
index c2a857a2c..0aa41849a 100644
--- a/src/drivers/webextension/_locales/it/messages.json
+++ b/src/drivers/webextension/_locales/it/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Inviare anonimamente un report sulle applicazioni rilevate a wappalyzer.com per l'analisi" },
   "optionThemeMode":          { "message": "Abilita compatibilità con la modalità scura." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Niente da fare qui." },
diff --git a/src/drivers/webextension/_locales/ja/messages.json b/src/drivers/webextension/_locales/ja/messages.json
index af3feb4e8..43a446b31 100644
--- a/src/drivers/webextension/_locales/ja/messages.json
+++ b/src/drivers/webextension/_locales/ja/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "特定した技術を匿名でwappalyzer.comに送信する" },
   "optionThemeMode":          { "message": "Enable dark mode compatibility." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "ここでは特定出来ません。" },
diff --git a/src/drivers/webextension/_locales/ko/messages.json b/src/drivers/webextension/_locales/ko/messages.json
index bb3c3f861..a37597a04 100644
--- a/src/drivers/webextension/_locales/ko/messages.json
+++ b/src/drivers/webextension/_locales/ko/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "익명으로 wappalyzer.com에 식별된 기술 정보 전송" },
 	"optionThemeMode":          { "message": "다크 모드 호환 활성화" },
 	"optionBadge":              { "message": "아이콘에 식별된 기술 갯수 표시" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "이 웹 사이트에서 끄기" },
 	"clearCache":               { "message": "캐시된 식별 정보 지우기" },
 	"nothingToDo":              { "message": "여기에는 할 일이 없네요." },
diff --git a/src/drivers/webextension/_locales/pl/messages.json b/src/drivers/webextension/_locales/pl/messages.json
index ef16bbf54..c02e6f4bb 100644
--- a/src/drivers/webextension/_locales/pl/messages.json
+++ b/src/drivers/webextension/_locales/pl/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Przesyłaj anonimowe statystyki aplikacji wykrytych przez Wappalyzer do twórców" },
   "optionThemeMode":          { "message": "Włącz kompatybilność z ciemnym motywem." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nic tu nie ma." },
diff --git a/src/drivers/webextension/_locales/pt/messages.json b/src/drivers/webextension/_locales/pt/messages.json
index 08bed3205..07d53fde5 100644
--- a/src/drivers/webextension/_locales/pt/messages.json
+++ b/src/drivers/webextension/_locales/pt/messages.json
@@ -10,6 +10,7 @@
   "optionsSave":              { "message": "Opções de Guardar" },
   "optionsSaved":             { "message": "Guardado" },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
   "twitter":                  { "message": "Seguir Wappalyzer no Twitter" },
diff --git a/src/drivers/webextension/_locales/pt_BR/messages.json b/src/drivers/webextension/_locales/pt_BR/messages.json
index acd1b370d..0aa75106e 100644
--- a/src/drivers/webextension/_locales/pt_BR/messages.json
+++ b/src/drivers/webextension/_locales/pt_BR/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Enviar relatórios anônimos para wappalyzer.com sobre tecnologias identificadas" },
   "optionThemeMode":          { "message": "Permitir a compatibilidade modo escuro." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nada a fazer aqui." },
diff --git a/src/drivers/webextension/_locales/ro/messages.json b/src/drivers/webextension/_locales/ro/messages.json
index 051fc5f74..a0ce7a68e 100644
--- a/src/drivers/webextension/_locales/ro/messages.json
+++ b/src/drivers/webextension/_locales/ro/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Trimite rapoarte anonime despre aplicațiile detectate către wappalyzer.com pentru cercetare" },
 	"optionThemeMode":          { "message": "Activează modul de compatibilitate întuneric." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Nimic de făcut pe pagina curentă." },
diff --git a/src/drivers/webextension/_locales/ru/messages.json b/src/drivers/webextension/_locales/ru/messages.json
index 2c39460d2..46c87c6b1 100644
--- a/src/drivers/webextension/_locales/ru/messages.json
+++ b/src/drivers/webextension/_locales/ru/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Анонимно отправлять статистику распознанных данных на wappalyzer.com" },
 	"optionThemeMode":          { "message": "Темная тема" },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Здесь нечего делать" },
diff --git a/src/drivers/webextension/_locales/sk/messages.json b/src/drivers/webextension/_locales/sk/messages.json
index 129213dbf..62fa655da 100644
--- a/src/drivers/webextension/_locales/sk/messages.json
+++ b/src/drivers/webextension/_locales/sk/messages.json
@@ -10,6 +10,7 @@
   "optionTracking":           { "message": "Anonymne posielať správy o zistených aplikáciách na wappalyzer.com pre výskum" },
   "optionThemeMode":          { "message": "Povoliť kompatibilitu tmavú režim." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
   "nothingToDo":              { "message": "Nie je tu čo robiť." },
diff --git a/src/drivers/webextension/_locales/tr/messages.json b/src/drivers/webextension/_locales/tr/messages.json
index 84acba5cc..6f9b628f1 100644
--- a/src/drivers/webextension/_locales/tr/messages.json
+++ b/src/drivers/webextension/_locales/tr/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Anonim olarak tespit edilen uygulamalar hakkında wappalyzer.com'a araştırma raporları gönderin" },
 	"optionThemeMode":          { "message": "Karanlık modu uyumluluğu etkinleştirin." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Burada yapacak birşey yok." },
diff --git a/src/drivers/webextension/_locales/uk/messages.json b/src/drivers/webextension/_locales/uk/messages.json
index 894fb7dd6..9ff4aa27f 100644
--- a/src/drivers/webextension/_locales/uk/messages.json
+++ b/src/drivers/webextension/_locales/uk/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Анонімно надсилати статистику розпізнавань на сервер для досліджень" },
   "optionThemeMode":          { "message": "Включити сумісність темного режиму." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Тут нічого робити." },
diff --git a/src/drivers/webextension/_locales/uz/messages.json b/src/drivers/webextension/_locales/uz/messages.json
index ae7082790..661819b2c 100644
--- a/src/drivers/webextension/_locales/uz/messages.json
+++ b/src/drivers/webextension/_locales/uz/messages.json
@@ -10,6 +10,7 @@
 	"optionTracking":           { "message": "Wappalyzer takomillashtirish uchun hisobotlarni maxfiy ravishda serverga jo'natish" },
 	"optionThemeMode":          { "message": "qorong'i rejimi mosligini yoqish." },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
 	"nothingToDo":              { "message": "Bu yerda tekshirib bolmaydi." },
diff --git a/src/drivers/webextension/_locales/zh_CN/messages.json b/src/drivers/webextension/_locales/zh_CN/messages.json
index 6420e3ae5..628792a6c 100644
--- a/src/drivers/webextension/_locales/zh_CN/messages.json
+++ b/src/drivers/webextension/_locales/zh_CN/messages.json
@@ -10,6 +10,7 @@
   "optionTracking":           { "message": "匿名发送检测到的技术至 wappalyzer.com" },
   "optionThemeMode":          { "message": "启用深色模式兼容" },
   "optionBadge":              { "message": "在图标上显示检测到技术的个数" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
   "disableOnDomain":          { "message": "在该网站禁用" },
   "clearCache":               { "message": "清除检测缓存" },
   "nothingToDo":              { "message": "这里无事可做。" },
diff --git a/src/drivers/webextension/_locales/zh_TW/messages.json b/src/drivers/webextension/_locales/zh_TW/messages.json
index 80af98493..300e4273c 100644
--- a/src/drivers/webextension/_locales/zh_TW/messages.json
+++ b/src/drivers/webextension/_locales/zh_TW/messages.json
@@ -10,6 +10,7 @@
   "optionTracking":           { "message": "匿名傳送已識別的技術至 wappalyzer.com" },
   "optionThemeMode":          { "message": "啟用暗模式的兼容性。" },
 	"optionBadge":              { "message": "Show the number of identified technologies on the icon" },
+	"optionShowCached":         { "message": "Include cached detections in results" },
 	"disableOnDomain":          { "message": "Disable on this website" },
 	"clearCache":               { "message": "Clear cached detections" },
   "nothingToDo":              { "message": "這裡什麼也沒有。" },
diff --git a/src/drivers/webextension/html/options.html b/src/drivers/webextension/html/options.html
index f7ffb9182..d8640247d 100644
--- a/src/drivers/webextension/html/options.html
+++ b/src/drivers/webextension/html/options.html
@@ -31,6 +31,12 @@
         <span data-i18n="optionBadge">&nbsp;</span>
       </label>
 
+      <label class="options__label">
+        <input class="options__checkbox" type="checkbox">
+
+        <span data-i18n="optionShowCached">Show cached results</span>
+      </label>
+
       <label class="options__label">
         <input class="options__checkbox" type="checkbox">
 
diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index 65dc66878..20c1a2de7 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -84,6 +84,7 @@ const Driver = {
 
         Driver.cache.tabs[id] = cache ? resolve(cache.detections) : []
 
+        console.log('a')
         await Driver.setIcon(url, Driver.cache.tabs[id])
       }
     })
@@ -430,30 +431,41 @@ const Driver = {
       return
     }
 
-    const { protocol, hostname } = new URL(url)
+    const { hostname } = new URL(url)
 
     // Cache detections
-    const cache = (Driver.cache.hostnames[hostname] = {
-      ...(Driver.cache.hostnames[hostname] || {
-        url: `${protocol}//${hostname}`,
-        detections: [],
-        hits: incrementHits ? 0 : 1,
-      }),
-      dateTime: Date.now(),
+    const cache = (Driver.cache.hostnames[hostname] = Driver.cache.hostnames[
+      hostname
+    ] || {
+      detections: [],
+      hits: incrementHits ? 0 : 1,
     })
 
+    cache.dateTime = Date.now()
+
     // Remove duplicates
     cache.detections = cache.detections
       .concat(detections)
       .filter(({ technology }) => technology)
       .filter(
-        ({ technology: { name }, pattern: { regex } }, index) =>
-          cache.detections.findIndex(
+        ({ technology: { name }, pattern: { regex } }, index, detections) =>
+          detections.findIndex(
             ({ technology: { name: _name }, pattern: { regex: _regex } }) =>
               name === _name &&
               (!regex || regex.toString() === _regex.toString())
           ) === index
       )
+      .map((detection) => {
+        if (
+          detections.find(
+            ({ technology: { slug } }) => slug === detection.technology.slug
+          )
+        ) {
+          detection.lastUrl = url
+        }
+
+        return detection
+      })
 
     cache.hits += incrementHits ? 1 : 0
     cache.language = cache.language || language
@@ -475,17 +487,18 @@ const Driver = {
     await setOption(
       'hostnames',
       Object.keys(Driver.cache.hostnames).reduce(
-        (cache, hostname) => ({
-          ...cache,
+        (hostnames, hostname) => ({
+          ...hostnames,
           [hostname]: {
-            ...Driver.cache.hostnames[hostname],
-            detections: Driver.cache.hostnames[hostname].detections
+            ...cache,
+            detections: cache.detections
               .filter(({ technology }) => technology)
               .map(
                 ({
                   technology: { name: technology },
                   pattern: { regex, confidence },
                   version,
+                  lastUrl,
                 }) => ({
                   technology,
                   pattern: {
@@ -493,6 +506,7 @@ const Driver = {
                     confidence,
                   },
                   version,
+                  lastUrl,
                 })
               ),
           },
@@ -501,8 +515,15 @@ const Driver = {
       )
     )
 
-    const resolved = resolve(Driver.cache.hostnames[hostname].detections)
+    const resolved = resolve(cache.detections).map((detection) => {
+      detection.cached = detection.lastUrl !== url
+
+      delete detection.lastUrl
+
+      return detection
+    })
 
+    console.log('b')
     await Driver.setIcon(url, resolved)
 
     if (url) {
@@ -543,12 +564,16 @@ const Driver = {
     }
 
     const dynamicIcon = await getOption('dynamicIcon', false)
+    const showCached = await getOption('showCached', true)
     const badge = await getOption('badge', true)
 
+    console.log(showCached)
+
     let icon = 'default.svg'
 
     const _technologies = technologies.filter(
-      ({ slug }) => slug !== 'cart-functionality'
+      ({ slug, cached }) =>
+        slug !== 'cart-functionality' && (showCached || cached === false)
     )
 
     if (dynamicIcon) {
@@ -613,13 +638,19 @@ const Driver = {
     })
 
     if (await Driver.isDisabledDomain(url)) {
+      console.log('c')
       await Driver.setIcon(url, [])
 
       return
     }
 
-    const resolved = Driver.cache.tabs[id]
+    const showCached = await getOption('showCached', true)
+
+    const resolved = (Driver.cache.tabs[id] || []).filter(
+      ({ cached }) => showCached || cached === false
+    )
 
+    console.log('d')
     await Driver.setIcon(url, resolved)
 
     return resolved
diff --git a/src/drivers/webextension/js/options.js b/src/drivers/webextension/js/options.js
index c43ebcea1..4d3896262 100644
--- a/src/drivers/webextension/js/options.js
+++ b/src/drivers/webextension/js/options.js
@@ -17,6 +17,7 @@ const Options = {
       ['dynamicIcon', false],
       ['badge', true],
       ['tracking', true],
+      ['showCached', true],
     ].map(async ([option, defaultValue]) => {
       const el = document
         .querySelector(
diff --git a/src/drivers/webextension/js/popup.js b/src/drivers/webextension/js/popup.js
index c6a7dff8c..70c0753b5 100644
--- a/src/drivers/webextension/js/popup.js
+++ b/src/drivers/webextension/js/popup.js
@@ -351,7 +351,7 @@ const Popup = {
       )
 
       technologies.forEach(
-        ({ name, slug, confidence, version, icon, website }) => {
+        ({ name, slug, confidence, version, icon, website, current }) => {
           const technologyNode = Popup.templates.technology.cloneNode(true)
 
           const image = technologyNode.querySelector('.technology__icon img')
diff --git a/src/wappalyzer.js b/src/wappalyzer.js
index bf1cb5b12..57508d81c 100644
--- a/src/wappalyzer.js
+++ b/src/wappalyzer.js
@@ -29,7 +29,7 @@ const Wappalyzer = {
    * @param {Array} detections
    */
   resolve(detections = []) {
-    const resolved = detections.reduce((resolved, { technology }) => {
+    const resolved = detections.reduce((resolved, { technology, lastUrl }) => {
       if (
         resolved.findIndex(
           ({ technology: { name } }) => name === technology.name
@@ -52,7 +52,7 @@ const Wappalyzer = {
             }
           )
 
-        resolved.push({ technology, confidence, version })
+        resolved.push({ technology, confidence, version, lastUrl })
       }
 
       return resolved
@@ -74,6 +74,7 @@ const Wappalyzer = {
           technology: { name, slug, categories, icon, website, cpe },
           confidence,
           version,
+          lastUrl,
         }) => ({
           name,
           slug,
@@ -83,6 +84,7 @@ const Wappalyzer = {
           icon,
           website,
           cpe,
+          lastUrl,
         })
       )
   },
@@ -161,7 +163,7 @@ const Wappalyzer = {
     do {
       done = true
 
-      resolved.forEach(({ technology, confidence }) => {
+      resolved.forEach(({ technology, confidence, lastUrl }) => {
         technology.implies.forEach(({ name, confidence: _confidence }) => {
           const implied = Wappalyzer.getTechnology(name)
 
@@ -178,6 +180,7 @@ const Wappalyzer = {
               technology: implied,
               confidence: Math.min(confidence, _confidence),
               version: '',
+              lastUrl,
             })
 
             done = false