Merge "MessageCache: Add STRAIGHT_JOIN to avoid planner oddness"