Resolve #3564937 "Remove duplicative caching"

catchrequested to merge
issue/drupal-3564937:3564937-remove-duplicative-caching into main

Closes #3564937

Merge request reports