Merge "SF: add traces for caching" into sc-dev