refactoring
refactoring
refactored cacheServiceTypeScenarios