Improve ServiceCache behavior with duplicate service instances.
Few updates to @ohhatiya's take on ServiceCache bugfixes