Issue #2754003 by Berdir, Wim Leers: Move more cache items from the default to the bootstrap or discovery bin