Merge "BUG-650: cache translated future"