fix: #3496257 Race conditions in CacheCollector/State (again)

catchrequested to merge
issue/drupal-3496257:3496257-11x into 11.x

By: catch By: godotislate By: dww By: spokje By: nicxvan By: alexpott By: luke.leber By: berdir

Closes #3496257

Merge request reports