Unify code to use RequestServicesContainer always