From a6fcd8826114b7da5c6fa3507c35f2ba006bcc56 Mon Sep 17 00:00:00 2001
From: Piotr Kontek <piotr.kontek@solet.pl>
Date: Thu, 18 Dec 2025 08:54:38 +0100
Subject: [PATCH] cache empty result for picklist label retrieval in
 _ODataClient

---
 src/PowerPlatform/Dataverse/data/_odata.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/PowerPlatform/Dataverse/data/_odata.py b/src/PowerPlatform/Dataverse/data/_odata.py
index 8eda7ad..adfa6fa 100644
--- a/src/PowerPlatform/Dataverse/data/_odata.py
+++ b/src/PowerPlatform/Dataverse/data/_odata.py
@@ -1015,7 +1015,9 @@ def _optionset_map(self, table_schema_name: str, attr_logical: str) -> Optional[
         body_type = r_type.json()
         items = body_type.get("value", []) if isinstance(body_type, dict) else []
         if not items:
-            return None
+            # cache empty result
+            self._picklist_label_cache[cache_key] = {"map": {}, "ts": now}
+            return {}
         attr_md = items[0]
         if attr_md.get("AttributeType") not in ("Picklist", "PickList"):
             self._picklist_label_cache[cache_key] = {"map": {}, "ts": now}