Merge branch 'cache' into gui