Fix NPE
Enable caching for bundles