Merge branch 'optimization' into better_cache