Improve ServiceCache behavior with duplicate service instances.
Merge pull request #145 from bbeck/master

Prepare for version 1.6.0
Merge remote-tracking branch 'mark/servicecache-bugfixes'
Few updates to @ohhatiya's take on ServiceCache bugfixes