Merge "Add clarifying comment on enableAddServiceCache" into main