ECMS-5822: Make service thread-safety