Revert "Remove the word boundary cache"