diff --git a/.pick_status.json b/.pick_status.json
index ecb6e52c028..33f6fc68eac 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -25054,7 +25054,7 @@
         "description": "llvmpipe: Fix compiling with LP_USE_TEXTURE_CACHE",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "36eb75d281bd0898b4b669969993f38b5fa9515b",
         "notes": null
diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample.c b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
index f150b65011e..e17a7ce6f87 100644
--- a/src/gallium/drivers/llvmpipe/lp_tex_sample.c
+++ b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
@@ -75,7 +75,8 @@ lp_llvm_sampler_soa_create(const struct lp_sampler_static_state *static_state,
    sampler = lp_bld_llvm_sampler_soa_create(static_state, nr_samplers);
 
 #if LP_USE_TEXTURE_CACHE
-   sampler->dynamic_state.base.cache_ptr = lp_llvm_texture_cache_ptr;
+   struct lp_sampler_dynamic_state *dynamic_state = lp_build_sampler_soa_dynamic_state(sampler);
+   dynamic_state->cache_ptr = lp_llvm_texture_cache_ptr;
 #endif
    return sampler;
 }