More i18n + Cache 3.0