Merge branch 'sp/dircache'