Adding bundle caching

[ #1_8_7 ]