Fix nested service provider disposal