diff --git a/datasette/app.py b/datasette/app.py
index 2ab9b1b3..ba9e0234 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -1,6 +1,7 @@
 import asyncio
 import collections
 import hashlib
+import json
 import os
 import re
 import sys
@@ -12,7 +13,7 @@ from pathlib import Path
 
 import click
 from markupsafe import Markup
-from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader
+from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader, escape
 import uvicorn
 
 from .views.base import DatasetteError, ureg, AsgiRouter
@@ -36,6 +37,7 @@ from .utils import (
 from .utils.asgi import (
     AsgiLifespan,
     NotFound,
+    Response,
     asgi_static,
     asgi_send,
     asgi_send_html,
diff --git a/datasette/views/base.py b/datasette/views/base.py
index a048fe3d..af3c5623 100644
--- a/datasette/views/base.py
+++ b/datasette/views/base.py
@@ -9,8 +9,6 @@ import urllib
 import jinja2
 import pint
 
-from html import escape
-
 from datasette import __version__
 from datasette.plugins import pm
 from datasette.utils import (