Add bundle caching