Merge "Keep java cache for servicemanager" into main