Updates for multi-target and cached LLVM