Merge "configstore-utils: add feature to cache service handles"