Merge branch 'eval_cache'