Fix and test.

Dave Longrequested to merge
issue/drupal-3629680:3629680-minimise-page-cache-entries into main

Closes #3629680

Merge request reports