i18n & Caching added