Improve ServiceCache behavior with duplicate service instances.
Few updates to @ohhatiya's take on ServiceCache bugfixes
Merge pull request #138 from ohhatiya/servicecache-bugfixes

ServiceCache bugfixes