Hi, does anyone have a recommendation for on-bike tool and/or pump storage bottle cages for the Rise M series? Space around the cage is minimal due to width of downtube and motor. I assume the OneUp EDC pump won't fit, but has anyone tried? Does the Topeak Ninja bottle cage with multi tool fit...