Another attempt at bundle caching