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
branch admin -prepare release ostrich-1.6.0
branch admin -prepare for next development iteration
Merge remote-tracking branch 'upstream/master'