diff --git a/src/DeviceManager.cpp b/src/DeviceManager.cpp
index c3d6aa3..52f09bb 100644
--- a/src/DeviceManager.cpp
+++ b/src/DeviceManager.cpp
@@ -858,6 +858,7 @@ void DeviceManager::addBleDevice(const QBluetoothDeviceInfo &info)
         if (info.isCached() || info.rssi() == 0) d->setCached(true);
         if (info.name().isEmpty()) d->setBeacon(true);
         if (info.name().replace('-', ':') == d->getAddress()) d->setBeacon(true);
+        if (info.name() == "Bluetooth " + d->getAddress().toLower()) d->setBeacon(true);
         if (m_devices_blacklist.contains(d->getAddress())) d->setBlacklisted(true);
 
         // Get a random color
diff --git a/src/DeviceManager_advertisement.cpp b/src/DeviceManager_advertisement.cpp
index 36f85e1..0543075 100644
--- a/src/DeviceManager_advertisement.cpp
+++ b/src/DeviceManager_advertisement.cpp
@@ -74,7 +74,7 @@ void DeviceManager::updateBleDevice(const QBluetoothDeviceInfo &info,
             dd->setName(info.name());
             dd->setRssi(info.rssi());
             dd->setLastSeen(QDateTime::currentDateTime());
-            dd->setCached(info.isCached() || info.rssi() >= 0);
+            dd->setCached(info.rssi() >= 0);
             dd->setCoreConfiguration(info.coreConfigurations());
             dd->setDeviceClass(info.majorDeviceClass(), info.minorDeviceClass(), info.serviceClasses());
             dd->setAdvertisedServices(info.serviceUuids());
diff --git a/src/device_toolblex.cpp b/src/device_toolblex.cpp
index 5897e56..a0a6baf 100644
--- a/src/device_toolblex.cpp
+++ b/src/device_toolblex.cpp
@@ -69,7 +69,7 @@ DeviceToolBLEx::DeviceToolBLEx(const QBluetoothDeviceInfo &d, QObject *parent):
 
     addAdvertisementEntry(d.rssi(), !d.manufacturerIds().empty(), !d.serviceIds().empty());
 
-    m_isCached = (d.isCached() || d.rssi() == 0);
+    m_isCached = (d.rssi() == 0);
     m_hasServiceCache = checkServiceCache();
     m_firstSeen = QDateTime::currentDateTime();
     m_bluetoothCoreConfiguration = d.coreConfigurations();