Fix race condition in using an unsynchronized map in ServiceCache
Merge pull request #149 from bbeck/master

Fix race condition in using an unsynchronized map in ServiceCache