fix: #3632459 Cached container causes errors after TrashConfigSubscriber update

Andrei Mateescurequested to merge
issue/trash-3632459:3632459-rebuild-service-container-3.1.x into 3.1.x

Closes #3632459

Merge request reports