Fix interaction of custom translation classes and caching (#9042)
3 files changed