[FOLD] BootstrapCache fixes