word fix
Merge branch 'cache'