XWIKI-11396: Better name for Cache Macro cache ids