diff --git a/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java b/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
index 190309403..440c15ede 100644
--- a/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
+++ b/teavm-cli/src/main/java/org/teavm/cli/TeaVMRunner.java
@@ -78,10 +78,6 @@ public final class TeaVMRunner {
                 .withDescription("Incremental build cache directory")
                 .withLongOpt("cachedir")
                 .create('c'));
-        options.addOption(OptionBuilder
-                .withDescription("Generate source maps")
-                .withLongOpt("sourcemaps")
-                .create());
 
         if (args.length == 0) {
             printUsage(options);
@@ -140,6 +136,8 @@ public final class TeaVMRunner {
         }
         if (commandLine.hasOption('c')) {
             tool.setCacheDirectory(new File(commandLine.getOptionValue('c')));
+        } else {
+            tool.setCacheDirectory(new File(tool.getTargetDirectory(), "teavm-cache"));
         }
         args = commandLine.getArgs();
         if (args.length > 1) {
diff --git a/teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java b/teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java
index ef1ca0d9a..5dfdea273 100644
--- a/teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java
+++ b/teavm-core/src/main/java/org/teavm/tooling/TeaVMTool.java
@@ -279,7 +279,6 @@ public class TeaVMTool {
                     cachedClassSource.flush();
                     symbolTable.flush();
                     fileTable.flush();
-                    log.info(mainClass);
                     log.info("Cache updated");
                 }
             }