diff --git a/src/Compilation.zig b/src/Compilation.zig
index 4c3e49fb52d8e6dc88c5f503407510b964b5ea63..063b5fd489feb8b1f8210aac4f5d506f22c21cd0 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -780,7 +780,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
         // compiler state, the second clause here can be removed so that incremental
         // cache mode is used for LLVM backend too. We need some fuzz testing before
         // that can be enabled.
-        const cache_mode = if (use_llvm and !options.disable_lld_caching)
+        const cache_mode = if ((use_llvm or options.main_pkg == null) and !options.disable_lld_caching)
             CacheMode.whole
         else
             options.cache_mode;
diff --git a/src/main.zig b/src/main.zig
index e68c0e84c496e74c1a2dd8f5cea7f93b0cc88d5e..2bc4961cba939aaa4fb4bbb0663455a258f7fa56 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -1161,6 +1161,7 @@ fn buildOutputType(
                     } else if (mem.eql(u8, arg, "--debug-log")) {
                         if (!build_options.enable_logging) {
                             std.log.warn("Zig was compiled without logging enabled (-Dlog). --debug-log has no effect.", .{});
+                            _ = args_iter.nextOrFatal();
                         } else {
                             try log_scopes.append(gpa, args_iter.nextOrFatal());
                         }