Shift translation caching logic to be shared between requests
Add missing message