Use a better container cache key

Alex Pottrequested to merge
issue/drupal-3509069:3509069-container-cache-key into 11.x

Closes #3509069

Merge request reports