Cache bundler

MSP-11930