Cache bundler

MSP-11929