Merge branch 'ek/fscache'