diff --git a/app.js b/app.js
index da1018f..ec7e701 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,7 @@ const app = new koa();
 const config = require('config');
 const path = require('path');
 const router = require('./router');
-require('./db')();
+require('./db');
 
 app.keys = config.keys;
 app.proxy = true;
diff --git a/router.js b/router.js
index 3e6c018..f8f3430 100644
--- a/router.js
+++ b/router.js
@@ -4,6 +4,8 @@ const pastes = require('./controllers/pastes');
 
 router
 	.get('/', async (ctx) => {
+		ctx.set('Cache-Control', 'no-cache');
+
 		await ctx.render('index', {
 			pretty: config.prettyHtml,
 			title: config.name,
@@ -13,6 +15,6 @@ router
 		});
 	})
 	.post('/', pastes.create)
-	.get('/:id', pastes.view);
+	.get('/:id', require('koa-conditional-get')(), require('koa-etag')(), pastes.view);
 
 module.exports = router;