Merge branch 'better_cache' into optimization