Fix some issues with caching and i18n