Replace cache_size with cache-size -- #2205
Merge branch 'michel_2205_conf' into next