Merge branch 'jk/cached-textconv'