Merge "Add a cache to getService with invalidation" into main