Adding bundle caching