Merge "collation: Refactor getFirstLetterData() cache handling"