Merge remote-tracking branch 'mark/servicecache-bugfixes'
Few updates to @ohhatiya's take on ServiceCache bugfixes
Merge remote-tracking branch 'mark/servicecache-bugfixes'
Merge pull request #1 from bbeck/master

Use ServiceHandle instances to track which services need to be cleaned up.