QA-6199  : reduce number of calls to external provider