diff --git a/server.pl b/server.pl
index de822da..0192d97 100644
--- a/server.pl
+++ b/server.pl
@@ -41,19 +41,9 @@ if (defined $ENV{'LOCAL_DOMAINS'}) {
   package DotplanApi;
   use base qw(HTTP::Server::Simple::CGI);
   sub net_server { 'Net::Server::Fork' }
-  use HTTP::Server::Simple::Static;
   my $webroot = './static';
 
-  # Caching DNS resolver
-  {
-    package Net::DNS::Resolver;
-    my %cache;
-    sub query {
-      my $self = shift;
-      $cache{"@_"} ||= $self->SUPER::query(@_);
-    }
-  }
-
+  use HTTP::Server::Simple::Static;
   use IPC::Run;
   use DBI;
   use File::Temp qw(tempfile);
diff --git a/test/run.sh b/test/run.sh
index 026743d..b87b726 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -322,6 +322,8 @@ now=`perl -e 'use HTTP::Date; print HTTP::Date::time2str(time)'`
 curl_test 'If-Modified-Since header' 304 'text/plain' -H 'Accept: text/*' -H "If-Modified-Since: $now" localhost:$PORT/plan/$TEST_USER \
   && assert_equal 'Empty content' "$TEST_CONTENT" ""
 
+curl_test 'Static index' 200 'text/html' localhost:$PORT/
+
 ###############
 # Test Teardown
 ###############