From b062871fd5cbecd982b4c05517fdeb8f6fa83bbc Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 11 May 2026 23:13:24 -0700
Subject: [PATCH 1/2] fix: app caching invalid values before checking if they
 are valid

---
 packages/app-lib/src/state/cache.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index 0e461843e3..2501ad1d4d 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -890,17 +890,6 @@ impl CachedEntry {
                     }
                 }
 
-                remaining_keys.retain(|x| {
-                    x != &&*row.id
-                        && !row.alias.as_ref().is_some_and(|y| {
-                            if type_.case_sensitive_alias().unwrap_or(true) {
-                                x == y
-                            } else {
-                                y.to_lowercase() == x.to_lowercase()
-                            }
-                        })
-                });
-
                 if let Some(data) = parsed_data {
                     if data.get_type() != type_ {
                         return Err(crate::ErrorKind::OtherError(format!(
@@ -912,6 +901,17 @@ impl CachedEntry {
                         .as_error());
                     }
 
+                    remaining_keys.retain(|x| {
+                        x != &&*row.id
+                            && !row.alias.as_ref().is_some_and(|y| {
+                                if type_.case_sensitive_alias().unwrap_or(true) {
+                                    x == y
+                                } else {
+                                    y.to_lowercase() == x.to_lowercase()
+                                }
+                            })
+                    });
+
                     return_vals.push(Self {
                         id: row.id,
                         alias: row.alias,

From 8950dcc1e1986cd03da17382621c773edbeb8f21 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 11 May 2026 23:19:51 -0700
Subject: [PATCH 2/2] prepr

---
 packages/app-lib/src/state/cache.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/app-lib/src/state/cache.rs b/packages/app-lib/src/state/cache.rs
index 2501ad1d4d..414e9ec04e 100644
--- a/packages/app-lib/src/state/cache.rs
+++ b/packages/app-lib/src/state/cache.rs
@@ -904,7 +904,8 @@ impl CachedEntry {
                     remaining_keys.retain(|x| {
                         x != &&*row.id
                             && !row.alias.as_ref().is_some_and(|y| {
-                                if type_.case_sensitive_alias().unwrap_or(true) {
+                                if type_.case_sensitive_alias().unwrap_or(true)
+                                {
                                     x == y
                                 } else {
                                     y.to_lowercase() == x.to_lowercase()