Fixed tag names and i18n caching