fix: Cached container causes errors after TrashConfigSubscriber update

Benji Fisherrequested to merge
issue/trash-3632459:3632459-rebuild-service-container into 3.x

Closes #3632459

Merge request reports