diff --git a/.pick_status.json b/.pick_status.json
index 0ae25a25a5b..8b4ab78ce74 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -354,7 +354,7 @@
         "description": "v3d: don't build disk cache access on shader disablement",
         "nominated": true,
         "nomination_type": 4,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 0beb8481cd6..cc666bc881a 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -749,6 +749,7 @@ v3d_screen_get_compatible_tlb_format(struct pipe_screen *screen,
         }
 }
 
+#ifdef ENABLE_SHADER_CACHE
 static struct disk_cache *
 v3d_screen_get_disk_shader_cache(struct pipe_screen *pscreen)
 {
@@ -756,6 +757,7 @@ v3d_screen_get_disk_shader_cache(struct pipe_screen *pscreen)
 
         return screen->disk_cache;
 }
+#endif
 
 static int
 v3d_screen_get_fd(struct pipe_screen *pscreen)
@@ -833,7 +835,9 @@ v3d_screen_create(int fd, const struct pipe_screen_config *config,
         pscreen->get_name = v3d_screen_get_name;
         pscreen->get_vendor = v3d_screen_get_vendor;
         pscreen->get_device_vendor = v3d_screen_get_vendor;
+#ifdef ENABLE_SHADER_CACHE
         pscreen->get_disk_shader_cache = v3d_screen_get_disk_shader_cache;
+#endif
         pscreen->query_dmabuf_modifiers = v3d_screen_query_dmabuf_modifiers;
         pscreen->is_dmabuf_modifier_supported =
                 v3d_screen_is_dmabuf_modifier_supported;