diff --git a/src/opnsense/scripts/unbound/blocklists/__init__.py b/src/opnsense/scripts/unbound/blocklists/__init__.py
index 23775ec9e..dda249396 100755
--- a/src/opnsense/scripts/unbound/blocklists/__init__.py
+++ b/src/opnsense/scripts/unbound/blocklists/__init__.py
@@ -100,7 +100,7 @@ class BaseBlocklistHandler:
                 if entry not in ['127.0.0.1', '0.0.0.0']:
                     break
             if entry:
-                yield entry
+                yield entry.lower()
 
     def _uri_reader(self, uri):
         """
diff --git a/src/opnsense/scripts/unbound/blocklists/default_bl.py b/src/opnsense/scripts/unbound/blocklists/default_bl.py
index 9fa80e939..421e50dc6 100755
--- a/src/opnsense/scripts/unbound/blocklists/default_bl.py
+++ b/src/opnsense/scripts/unbound/blocklists/default_bl.py
@@ -52,9 +52,8 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
         result = {}
         for blocklist, bl_shortcode in self._blocklists_in_config():
             per_file_stats = {'uri': blocklist, 'skip': 0, 'blocklist': 0}
-            for entry in self._domains_in_blocklist(blocklist):
-                domain = entry.lower()
-                if self._whitelist_pattern.match(entry):
+            for domain in self._domains_in_blocklist(blocklist):
+                if self._whitelist_pattern.match(domain):
                     per_file_stats['skip'] += 1
                 else:
                     if self.domain_pattern.match(domain):
@@ -82,9 +81,10 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
                         if self.domain_pattern.match(entry):
                             result[entry] = {'bl': 'Manual', 'wildcard': False}
                 elif key.startswith('wildcard'):
-                    if self.domain_pattern.match(value):
+                    entry = value.rstrip().lower()
+                    if self.domain_pattern.match(entry):
                         # do not apply whitelist to wildcard domains
-                        result[value] = {'bl': 'Manual', 'wildcard': True}
+                        result[entry] = {'bl': 'Manual', 'wildcard': True}
 
         return result
 
@@ -109,7 +109,7 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
         cache_loc = '/tmp/bl_cache/'
         if os.path.exists(cache_loc):
             filep = cache_loc + h
-            if os.path.exists(filep):
+            if os.path.exists(filep) and os.path.getsize(filep) > 0:
                 fstat = os.stat(filep).st_ctime
                 if (time.time() - fstat) < self.cache_ttl: # 20 hours, a bit under the recommended cron time
                     from_cache = True
diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py b/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py
index 7ac75a9d5..2cdf71341 100644
--- a/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py
+++ b/src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py
@@ -312,7 +312,7 @@ class DNSBL:
         if not query.type in ('A', 'AAAA', 'CNAME', 'HTTPS'):
             return False
 
-        domain = query.domain.rstrip('.')
+        domain = query.domain.rstrip('.').lower()
         sub = domain
         match = None
         while match is None: