New try for bundle caching