Issue #2473873: Alternative approach with cacheability

Adam Bramleyrequested to merge
issue/drupal-2473873:2473873-alternative into 11.x

Closes #2473873

Merge request reports