Token replacements lead to leaked metadata

Rerolled patch for 3.x

The problem is in certain situations, e.g. when sending out email, there was an error as the title described: `The controller result claims to be providing relevant cache metadata, but leaked metadata was detected. Ensure you are not rendering content too early`

With working patch now