Fix #1911 - Race condition with ChildContainerProvider