Merge early parts of jk/cached-textconv