Merge "replaces macro 'setc..' by 'set..CACHE'"