RA-328 Benefit from caching in TRUNK-2671