[PLAT-5945] Use the scenario selector as part of the execution cache key.

Reviewed-by: Tim Raggatt