Cleaning this up any further is a bit tricky as the caches in question
should only be evaluated if RequestStore is actually enabled.