LPS-36462 Keep serviceContext up-to-date