Merge "Add CachedService Class" into main