Small fix (translation cache management)
(cherry picked from commit 1683e5d)
(cherry picked from commit 6828376)