Improves caching in combination with the locale selector