Backport to branch(3.16) : Add wait for cache expiry

[feeblefakie]

This is an automated request for a manual backport of the following:

• Original PR: Add wait for cache expiry #3040
• Commit to backport: 6abf46d

1. Resolve any conflicts that occur during the cherry-picking process.

git fetch origin &&
git checkout 3.16-pull-3040 &&
git cherry-pick --no-rerere-autoupdate -m1 6abf46dad6728060367db84e4c38c4441bd743f1

2. Push the changes.
3. Merge this PR after all checks have passed.

Thank you!