Issue #1194136 by Berdir, damiankloip, Wim Leers: Re-organise core cache bins.