diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index 4121638b08c..17687299a61 100644
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -399,7 +399,6 @@ struct radv_ray_tracing_pipeline_cache_data {
 bool
 radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct vk_pipeline_cache *cache,
                                        struct radv_ray_tracing_pipeline *pipeline,
-                                       const VkRayTracingPipelineCreateInfoKHR *pCreateInfo,
                                        bool *found_in_application_cache)
 {
    *found_in_application_cache = false;
@@ -429,7 +428,7 @@ radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct vk_pip
    if (data->has_traversal_shader)
       pipeline->base.base.shaders[MESA_SHADER_INTERSECTION] = radv_shader_ref(pipeline_obj->shaders[idx++]);
 
-   for (unsigned i = 0; i < pCreateInfo->stageCount; i++) {
+   for (unsigned i = 0; i < pipeline->non_imported_stage_count; i++) {
       pipeline->stages[i].stack_size = data->stages[i].stack_size;
 
       if (data->stages[i].has_shader)
diff --git a/src/amd/vulkan/radv_pipeline_cache.h b/src/amd/vulkan/radv_pipeline_cache.h
index 9c1a06c915e..b06bfb448bf 100644
--- a/src/amd/vulkan/radv_pipeline_cache.h
+++ b/src/amd/vulkan/radv_pipeline_cache.h
@@ -52,7 +52,6 @@ void radv_pipeline_cache_insert(struct radv_device *device, struct vk_pipeline_c
 
 bool radv_ray_tracing_pipeline_cache_search(struct radv_device *device, struct vk_pipeline_cache *cache,
                                             struct radv_ray_tracing_pipeline *pipeline,
-                                            const VkRayTracingPipelineCreateInfoKHR *pCreateInfo,
                                             bool *found_in_application_cache);
 
 void radv_ray_tracing_pipeline_cache_insert(struct radv_device *device, struct vk_pipeline_cache *cache,
diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c
index a0b8299ecbd..2c1825f83b9 100644
--- a/src/amd/vulkan/radv_pipeline_rt.c
+++ b/src/amd/vulkan/radv_pipeline_rt.c
@@ -906,8 +906,7 @@ radv_rt_pipeline_create(VkDevice _device, VkPipelineCache _cache, const VkRayTra
    if (!skip_shaders_cache) {
       bool found_in_application_cache = true;
 
-      cache_hit =
-         radv_ray_tracing_pipeline_cache_search(device, cache, pipeline, pCreateInfo, &found_in_application_cache);
+      cache_hit = radv_ray_tracing_pipeline_cache_search(device, cache, pipeline, &found_in_application_cache);
       if (cache_hit && found_in_application_cache)
          pipeline_feedback.flags |= VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT;
    }