[PLAT-4305] Wrap remote convention source in EHCached form