Partial word cache fixes.