diff --git a/package.json b/package.json
index c966630..a974e05 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "glob-fs": "^0.1.6",
     "h2o2": "^5.4.0",
     "hapi": "~16.4.3",
+    "http-status": "^1.0.1",
     "idx": "^1.5.0",
     "inert": "^4.2.0",
     "isomorphic-fetch": "^2.2.1",
diff --git a/src/server/handle-api.js b/src/server/handle-api.js
index c525618..f8a7099 100644
--- a/src/server/handle-api.js
+++ b/src/server/handle-api.js
@@ -13,10 +13,10 @@ export default ({ server, config }) => {
   server.route({
     method: 'GET',
     path: '/api/v1/{query*}',
-    handler: (req, reply) => {
+    handler: (request, reply) => {
 
       const base = `${stripLeadingTrailingSlashes(config.siteUrl)}/wp-json/wp/v2`
-      const path = `${req.params.query}${req.url.search}`
+      const path = `${request.params.query}${request.url.search}`
       const remote = `${base}/${path}`
       const cacheKey = stripLeadingTrailingSlashes(path)
 
diff --git a/src/server/handle-dynamic.js b/src/server/handle-dynamic.js
index 4bb84e1..4ed86ac 100644
--- a/src/server/handle-dynamic.js
+++ b/src/server/handle-dynamic.js
@@ -1,11 +1,12 @@
 import { match } from 'react-router'
 import { loadPropsOnServer } from 'async-props'
-import has from 'lodash/has'
 import idx from 'idx'
 import chalk from 'chalk'
+import HTTPStatus from 'http-status'
 
 import RouteWrapper from '../shared/route-wrapper'
-import { renderHtml } from './render'
+import handleApiResponse from '../shared/handle-api-response'
+import renderHtml from './render'
 import log from '../utilities/logger'
 import CacheManager, { stripLeadingTrailingSlashes } from '../utilities/cache-manager'
 let cacheManager = new CacheManager()
@@ -28,7 +29,7 @@ export default ({ server, config, assets }) => {
         // 500 if error from Router
         if (err) {
           log.error(err)
-          return reply(err.message).code(500)
+          return reply(err.message).code(HTTPStatus.INTERNAL_SERVER_ERROR)
         }
 
         // define global deets for nested components
@@ -41,7 +42,7 @@ export default ({ server, config, assets }) => {
               loadContext,
               assets
             })
-          ).code(404)
+          ).code(HTTPStatus.NOT_FOUND)
         }
 
         // 301/2 if redirect
@@ -55,17 +56,19 @@ export default ({ server, config, assets }) => {
           // 500 if error from AsyncProps
           if (err) {
             log.error(err)
-            return reply(err).code(500)
+            return reply(err).code(HTTPStatus.INTERNAL_SERVER_ERROR)
           }
 
-          let status = 200
+          const response = handleApiResponse(
+            idx(asyncProps, _ => _.propsArray[0].data),
+            renderProps.routes[1]
+          )
 
-          const failApi = has(asyncProps.propsArray[0], 'data.data.status')
-          const failRoute = renderProps.routes[1].path === '*'
-          const cacheKey = stripLeadingTrailingSlashes(request.url.path)
+          const status = idx(response, _ => _.code) ?
+            response.code :
+            HTTPStatus.OK
 
-          if (failApi || failRoute)
-            status = 404
+          const cacheKey = stripLeadingTrailingSlashes(request.url.path)
 
           // Find HTML based on path - might be undefined
           const cachedHTML = cache.get(cacheKey)
@@ -79,6 +82,7 @@ export default ({ server, config, assets }) => {
             // No HTML found for this path, or cache expired
             // Regenerate HTML from scratch
             const html = renderHtml({
+              response,
               renderProps,
               loadContext,
               asyncProps,
diff --git a/src/server/handle-preview.js b/src/server/handle-preview.js
index 5553231..4fe58aa 100644
--- a/src/server/handle-preview.js
+++ b/src/server/handle-preview.js
@@ -1,24 +1,24 @@
 import chalk from 'chalk'
 import fetch from 'isomorphic-fetch'
 import log from '../utilities/logger'
+import { stripLeadingTrailingSlashes } from '../utilities/cache-manager'
 
 export default ({ server, config }) => {
 
   server.route({
     method: 'GET',
     path: '/api/preview/v1/{query*}',
-    handler: (req, reply) => {
+    handler: (request, reply) => {
 
-      const base = `${config.siteUrl}/wp-json/revision/v1`
-      const path = `${req.params.query}${req.url.search}`
+      const base = `${stripLeadingTrailingSlashes(config.siteUrl)}/wp-json/revision/v1`
+      const path = `${request.params.query}${request.url.search}`
       const remote = `${base}/${path}`
 
-      log.debug(`Preview: Server loading API response over HTTP for ${chalk.green(remote)}`)
-
       fetch(remote)
         .then(resp => resp.json())
         .then(resp => {
-          log.debug(`Preview: Server returned a fresh API response over HTTP for ${chalk.green(remote)}`)
+
+          log.debug(`Preview API response via HTTP for ${chalk.green(remote)}`)
           reply(resp)
         })
         .catch(err => log.error(err))
diff --git a/src/server/handle-purge.js b/src/server/handle-purge.js
index bff0200..92ae1c7 100644
--- a/src/server/handle-purge.js
+++ b/src/server/handle-purge.js
@@ -1,43 +1,46 @@
 import chalk from 'chalk'
 import { match } from 'react-router'
+import HTTPStatus from 'http-status'
+import isFunction from 'lodash/isFunction'
+
 import RouteWrapper from '../shared/route-wrapper'
 import log from '../utilities/logger'
 import CacheManager from '../utilities/cache-manager'
+
 const cacheManager = new CacheManager()
 const purgePath = process.env.SECRET_PURGE_PATH || 'purge'
 
 export default ({ server, config }) => {
-  const calculateApiRoute = (path, cb) => {
-    match({
-      routes: RouteWrapper(config),
-      location: path
-    }, (err, redirectLocation, renderProps) => {
-      // The HOC data loader component is always at index [1] while there is progres bar
-      let endpoint = renderProps.components[1].endpoint
-      if (typeof endpoint == 'function') {
-        endpoint = endpoint(renderProps.params)
-      }
-      log.debug(`Purge request for endpoint ${chalk.green(endpoint)}`)
-      cb(endpoint)
-    })
-  }
 
   server.route({
     method: 'GET',
     path: `/${purgePath}/{path*}`,
     handler: (request, reply) => {
-      calculateApiRoute(request.params.path, (apiRoute) => {
 
-        log.debug(`Request: ${chalk.green(request.params.path)} mapped to API: ${apiRoute}`)
-        const remote = `${config.siteUrl}/wp-json/wp/v2/${apiRoute}`
+      match({
+        routes: RouteWrapper(config),
+        location: request.params.path
+      }, (err, redirectLocation, renderProps) => {
 
-        log.debug(`Directly clearing html cache for ${chalk.green(request.params.path)}`)
-        cacheManager.clearCache('html', request.params.path)
+        let endpoint = renderProps.components[1].endpoint
+        let pathToPurge = endpoint
+
+        // resolve function if required
+        if (isFunction(endpoint)) {
+          pathToPurge = endpoint(renderProps.params)
+        }
 
-        log.debug(`Directly clearing api cache for ${chalk.green(remote)}`)
-        cacheManager.clearCache('api', remote)
+        log.debug(`Purge path ${chalk.green(request.params.path)} mapped to ${chalk.green(pathToPurge)}`)
+
+        log.debug(`Cache clear ${chalk.green(pathToPurge)} in API`)
+        cacheManager.clearCache('api', pathToPurge)
+
+        log.debug(`Cache clear ${chalk.green(request.params.path)} in HTML`)
+        cacheManager.clearCache('html', request.params.path)
 
-        reply({status: `Purged ${request.params.path}`}, 200)
+        reply({
+          status: `Purged ${request.params.path}`
+        }, HTTPStatus.OK)
       })
     }
   })
diff --git a/src/server/render/default-html.js b/src/server/render/default-html.js
index e4ccbd8..6b53244 100644
--- a/src/server/render/default-html.js
+++ b/src/server/render/default-html.js
@@ -1,10 +1,23 @@
 import React from 'react'
-import PropTypes from 'prop-types'
-import has from 'lodash/has'
+import idx from 'idx'
+import propTypes from './prop-types'
+
+// Add a stringify template helper for outputting JSON with forward
+// slashes escaped to prevent '</script>' tag output in JSON within
+// script tags. See http://stackoverflow.com/questions/66837/when-is-a-cdata-section-necessary-within-a-script-tag/1450633#1450633
+const escapeScriptTags = (data) => {
+  return JSON
+    .stringify(data)
+    .replace(/\//g, '\\/')
+    // Escape u2028 and u2029
+    // http://timelessrepo.com/json-isnt-a-javascript-subset
+    // https://github.com/mapbox/tilestream-pro/issues/1638
+    .replace(/\u2028/g, "\\u2028")
+    .replace(/\u2029/g, "\\u2029")
+}
 
 const defaultHtml = ({ markup, head, asyncProps, assets = {} }) => {
   const attr = head.htmlAttributes.toComponent()
-  const hasProps = has(asyncProps, 'propsArray')
   return (
     <html lang="en" {...attr}>
       <head>
@@ -21,41 +34,21 @@ const defaultHtml = ({ markup, head, asyncProps, assets = {} }) => {
       <body>
         <div id="root" dangerouslySetInnerHTML={{ __html: markup.html }} />
         {
-          hasProps &&
-            <script
-              type="text/javascript"
-              dangerouslySetInnerHTML={{
-                __html: `window.__ASYNC_PROPS__ = ${
-                  // Add a stringify template helper for outputting JSON with forward
-                  // slashes escaped to prevent '</script>' tag output in JSON within
-                  // script tags. See http://stackoverflow.com/questions/66837/when-is-a-cdata-section-necessary-within-a-script-tag/1450633#1450633
-                  JSON.stringify(asyncProps.propsArray)
-                    .replace(/\//g, '\\/')
-                    // Escape u2028 and u2029
-                    // http://timelessrepo.com/json-isnt-a-javascript-subset
-                    // https://github.com/mapbox/tilestream-pro/issues/1638
-                    .replace(/\u2028/g, "\\u2028")
-                    .replace(/\u2029/g, "\\u2029")
-                }`
-              }}
-            />
+          idx(asyncProps, _ => _.propsArray) &&
+          <script
+            type="text/javascript"
+            dangerouslySetInnerHTML={{
+              __html: `window.__ASYNC_PROPS__ = ${
+                escapeScriptTags(asyncProps.propsArray)
+              }`
+            }}
+          />
         }
       </body>
     </html>
   )
 }
 
-defaultHtml.propTypes = {
-  markup: PropTypes.shape({
-    html: PropTypes.string.isRequired,
-    ids: PropTypes.array.isRequired,
-    css: PropTypes.string.isRequired
-  }).isRequired,
-  head: PropTypes.object.isRequired,
-  asyncProps: PropTypes.shape({
-    propsArray: PropTypes.array
-  }),
-  assets: PropTypes.object
-}
+defaultHtml.propTypes = propTypes
 
 export default defaultHtml
diff --git a/src/server/render/index.js b/src/server/render/index.js
index 5bfeefa..d287500 100644
--- a/src/server/render/index.js
+++ b/src/server/render/index.js
@@ -3,11 +3,12 @@ import { renderToStaticMarkup, renderToString } from 'react-dom/server'
 import Helmet from 'react-helmet'
 import AsyncProps from 'async-props'
 import { renderStaticOptimized } from 'glamor/server'
+
 import DefaultHTML from './default-html'
 import RenderError from '../../shared/render-error'
 
-
-export const renderHtml = ({
+export default ({
+  response,
   renderProps = false,
   loadContext,
   asyncProps,
@@ -25,6 +26,7 @@ export const renderHtml = ({
             loadContext={loadContext}
           /> :
           <RenderError
+            response={response}
             config={loadContext}
           />
       )
diff --git a/src/server/render/prop-types.js b/src/server/render/prop-types.js
new file mode 100644
index 0000000..d642160
--- /dev/null
+++ b/src/server/render/prop-types.js
@@ -0,0 +1,14 @@
+import PropTypes from 'prop-types'
+
+export default {
+  markup: PropTypes.shape({
+    html: PropTypes.string.isRequired,
+    ids: PropTypes.array.isRequired,
+    css: PropTypes.string.isRequired
+  }).isRequired,
+  head: PropTypes.object.isRequired,
+  asyncProps: PropTypes.shape({
+    propsArray: PropTypes.array
+  }),
+  assets: PropTypes.object
+}
diff --git a/src/shared/default-error.js b/src/shared/default-error.js
index b1d0085..599e1e1 100644
--- a/src/shared/default-error.js
+++ b/src/shared/default-error.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 const DefaultError = ({
   message,
-  status,
+  code,
   children
 }) =>
   <section style={{
@@ -19,16 +19,16 @@ const DefaultError = ({
       <path style={{ fill: '#E5E5E5' }} d="M7.6 20.67h1.93v18.3H7.4c-.9.04-1.75.3-1.75.3V21.6s.86-.95 1.94-.95zm5.46-11.3h3.88V27.7h-3.88V9.38zm14.82.03h3.88v18.3h-3.88V9.4zm14.83 0h3.9v18.3h-3.9V9.4zm7.5 11.3h2.4c.8 0 1.5-.22 1.5-.22v18s-.4.44-1.73.5H50.2v-18.3zM13.1 31.94H17v18.3h-3.9v-18.3zm14.8.06h3.88v18.2H27.9V32zm14.83-.04h3.9v18.3h-3.9v-18.3zm-22.2-11.3h3.9v18.3h-3.9v-18.3zm14.83 0h3.88v18.3h-3.9v-18.3zM7.46 43.24H9.5V57.6c0 1.07-.87 1.95-1.94 1.95-1.08 0-1.95-.88-1.95-1.96V43.9s.5-.62 1.8-.73zM52.2 16.36h-2.1V2.14c0-1.08.87-1.96 1.94-1.96 1.07 0 1.94.88 1.94 1.96V15.9s-.72.47-1.8.47z"/>
     </svg>
     {
-      status &&
-        <p style={{
-          color: '#c0c0c0',
-          fontSize: '28px',
-          fontWeight: 'bold',
-          marginBottom: '10px',
-          marginTop: '20px'
-        }}>
-          {status}
-        </p>
+      code &&
+      <p style={{
+        color: '#c0c0c0',
+        fontSize: '28px',
+        fontWeight: 'bold',
+        marginBottom: '10px',
+        marginTop: '20px'
+      }}>
+        {code}
+      </p>
     }
     <h1 style={{
       color: '#c0c0c0',
@@ -46,7 +46,7 @@ DefaultError.defaultProps = {
 }
 DefaultError.propTypes = {
   message: PropTypes.string,
-  status: PropTypes.string,
+  code: PropTypes.number,
   children: PropTypes.node
 }
 
diff --git a/src/shared/fetch-data.js b/src/shared/fetch-data.js
index 1932ff2..19b1a01 100644
--- a/src/shared/fetch-data.js
+++ b/src/shared/fetch-data.js
@@ -1,12 +1,11 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import AsyncProps from 'async-props'
-import has from 'lodash/has'
-import isArray from 'lodash/isArray'
-import isEmpty from 'lodash/isEmpty'
+import idx from 'idx'
 import { generate as uid } from 'shortid'
 import fetchRouteData from './fetch-route-data'
 import RenderError from './render-error'
+import handleApiResponse from './handle-api-response'
 
 const fetchData = (TopLevelComponent, route) => {
 
@@ -41,33 +40,14 @@ const fetchData = (TopLevelComponent, route) => {
     }
 
     render() {
-      const response = this.props.data
-      const arrayResponse = isArray(response)
-      // to avoid React mangling the array to {'0':{},'1':{}}
-      // pass through as 'data'.
-      // TODO - update posts key to something more generic
-      const data = arrayResponse ?
-        { data: response } :
-        response
-      // should fail if an empty response?
-      // TODO - BLEAURGH, improve this.
-      const failIfEmpty = (
-        !arrayResponse ||
-        (
-          arrayResponse &&
-          !(has(route, 'options.allowEmptyResponse') && !route.options.allowEmptyResponse)
-        )
-      )
+      const response = handleApiResponse(this.props.data, this.props.route)
+
       // check data/component exists and isn't a server errored response
-      if (
-        !TopLevelComponent ||
-        !response ||
-        (isEmpty(response) && failIfEmpty) ||
-        has(response, 'data.status')
-      )  {
+      if (!TopLevelComponent || idx(response, _ => _.code)) {
         return (
           <RenderError
-            data={response}
+            response={response}
+            missing={!TopLevelComponent}
             config={this.props.route.config}
           />
         )
@@ -76,7 +56,7 @@ const fetchData = (TopLevelComponent, route) => {
       return (
         <TopLevelComponent
           key={uid()}
-          {...data}
+          {...response}
         />
       )
     }
diff --git a/src/shared/handle-api-response.js b/src/shared/handle-api-response.js
new file mode 100644
index 0000000..6a5ba83
--- /dev/null
+++ b/src/shared/handle-api-response.js
@@ -0,0 +1,29 @@
+import idx from 'idx'
+import HTTPStatus from 'http-status'
+import isArray from 'lodash/isArray'
+import isEmpty from 'lodash/isEmpty'
+
+export default (response, route) => {
+  // WP returns single objects or arrays
+  const arrayResp = isArray(response)
+  // 1: does it contain a status code? then it'll be an error response from WP
+  // 2: is it an empty array and allowEmptyResponse is not true
+  if (
+    !response ||
+    idx(response, _ => _.data.status) ||
+    (
+      arrayResp &&
+      isEmpty(response) &&
+      !idx(route, _ => _.component.options.allowEmptyResponse)
+    )
+  ) {
+    const status = idx(response, _ => _.data.status) || HTTPStatus.NOT_FOUND
+    return {
+      code: status,
+      message: HTTPStatus[status]
+    }
+  }
+  // to avoid React mangling the array to {'0':{},'1':{}}
+  // wrap in an object
+  return arrayResp ? { data: response } : response
+}
diff --git a/src/shared/missing-view.js b/src/shared/missing-view.js
index 382f48e..9e94378 100644
--- a/src/shared/missing-view.js
+++ b/src/shared/missing-view.js
@@ -3,18 +3,18 @@ import PropTypes from 'prop-types'
 import ObjectInspector from 'react-object-inspector'
 import DefaultError from './default-error'
 
-const MissingView = (data) =>
-  <DefaultError message="Missing Component">
+const MissingView = (response) =>
+  <DefaultError {...response}>
     {
-      data &&
-        <ObjectInspector
-          data={data}
-          initialExpandedPaths={['root']}
-        />
+      response &&
+      <ObjectInspector
+        data={response}
+        initialExpandedPaths={['root']}
+      />
     }
   </DefaultError>
 
 MissingView.propTypes = {
-  data: PropTypes.object
+  response: PropTypes.object
 }
 export default MissingView
diff --git a/src/shared/render-error.js b/src/shared/render-error.js
index 110aeff..23937c3 100644
--- a/src/shared/render-error.js
+++ b/src/shared/render-error.js
@@ -1,25 +1,29 @@
 import React from 'react'
+import idx from 'idx'
 import PropTypes from 'prop-types'
-import has from 'lodash/has'
 import DefaultError from './default-error'
 import MissingView from './missing-view'
 
-const RenderError = ({ config, data }) => {
+const RenderError = ({ config, response, missing }) => {
   // render custom error or default if custom error not declared
-  let ErrorView = has(config, 'components.CustomError') ?
+  let ErrorView = idx(config, _ => _.components.CustomError) ?
     config.components.CustomError :
     DefaultError
-  // always render missing view in development
-  if (__DEV__) {
-    ErrorView = () => MissingView(data)
+  // render missing component only in DEV
+  if (__DEV__ && missing) {
+    ErrorView = MissingView
+    response = {
+      message: 'Missing component'
+    }
   }
   // return one of the error views
-  return <ErrorView />
+  return <ErrorView {...response} />
 }
 
 RenderError.propTypes = {
   config: PropTypes.object,
-  data: PropTypes.any
+  missing: PropTypes.bool,
+  response: PropTypes.object
 }
 
 export default RenderError
diff --git a/src/shared/route-wrapper.js b/src/shared/route-wrapper.js
index 8f51b45..27ce5dd 100644
--- a/src/shared/route-wrapper.js
+++ b/src/shared/route-wrapper.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import { Route } from 'react-router'
 import { generate as uid } from 'shortid'
+import HTTPStatus from 'http-status'
 
 import defaultRoutes from './default-routes'
 import fetchData from './fetch-data'
@@ -16,8 +17,15 @@ const ComponentWrapper = (component, route) => {
 
 const RouteWrapper = (config) => {
   // if user routes have been defined, take those in preference to the defaults
+  const errorResponse = {
+    code: HTTPStatus.NOT_FOUND,
+    message: HTTPStatus[HTTPStatus.NOT_FOUND]
+  }
   const routes = config.routes || defaultRoutes(config.components)
-  const ErrorComponent = () => RenderError({ config })
+  const ErrorComponent = () => RenderError({
+    config,
+    response: errorResponse
+  })
   // loops over routes and return react-router <Route /> components
   return (
     <Route
diff --git a/test/tests/cache.test.js b/test/tests/cache.test.js
index f07ff3a..fc1206e 100644
--- a/test/tests/cache.test.js
+++ b/test/tests/cache.test.js
@@ -7,27 +7,34 @@ import CacheManager from '../../src/utilities/cache-manager'
 import { bootServer } from '../utils'
 import dataPost from '../mocks/post.json'
 import dataPosts from '../mocks/posts.json'
-
+import dataPage from '../mocks/page.json'
+import dataPages from '../mocks/pages.json'
 
 describe('Handling cache purges', () => {
 
   let tapestry = null
   let uri = null
   let config = {
-    components: {
-      FrontPage: () => <p>Hello</p>,
-      Post: () => <p>Hello</p>
-    },
+    routes: [{
+      path: 'string-endpoint',
+      endpoint: 'pages',
+      component: () => <p>Basic endpoint</p>
+    }, {
+      path: 'dynamic-string-endpoint/:custom',
+      endpoint: (params) => `pages?slug=${params.custom}`,
+      component: () => <p>Custom endpoint</p>
+    }],
     siteUrl: 'http://dummy.api'
   }
+  const cacheManager = new CacheManager()
 
   before(done => {
     // mock api response
     nock('http://dummy.api')
-      .get('/wp-json/wp/v2/posts?_embed')
-      .reply(200, dataPosts.data)
-      .get('/wp-json/wp/v2/posts?slug=test&_embed')
-      .reply(200, dataPost)
+      .get('/wp-json/wp/v2/pages')
+      .reply(200, dataPages.data)
+      .get('/wp-json/wp/v2/pages?slug=test')
+      .reply(200, dataPage)
     // boot tapestry server
     tapestry = bootServer(config)
     tapestry.server.on('start', () => {
@@ -38,32 +45,41 @@ describe('Handling cache purges', () => {
 
   after(() => tapestry.server.stop())
 
-  it('Homepage is purgeable', (done) => {
-    request.get(uri, (err, res, body) => {
-      expect(body).to.contain('Hello')
+  it('String endpoint is purgeable', (done) => {
+    const route = 'string-endpoint'
+    const purgeResp = { status: `Purged ${route}` }
+
+    request.get(`${uri}/${route}`, (err, res, body) => {
+      expect(body).to.contain('Basic endpoint')
       expect(res.statusCode).to.equal(200)
-      request
-        .get(`${uri}/purge//`, (err, res, body) => {
-          const purgeResponse = JSON.stringify({ status: 'Purged /' })
-          expect(body).to.contain(purgeResponse)
-          expect(res.statusCode).to.equal(200)
-          done()
-        })
+
+      request.get(`${uri}/purge/${route}`, (err, res, body) => {
+        const cacheApi = cacheManager.getCache('api')
+        expect(body).to.contain(JSON.stringify(purgeResp))
+        expect(res.statusCode).to.equal(200)
+        expect(cacheApi.keys()).to.not.contain('pages')
+
+        done()
+      })
     })
   })
 
-  it('Post is purgeable', (done) => {
-    const postRoute = '2017/12/01/test'
-    request.get(`${uri}/${postRoute}`, (err, res, body) => {
-      expect(body).to.contain('Hello')
+  it('Dynamic string endpoint is purgeable', (done) => {
+    const route = `dynamic-string-endpoint/test`
+    const purgeResp = { status: `Purged ${route}` }
+
+    request.get(`${uri}/${route}`, (err, res, body) => {
+      expect(body).to.contain('Custom endpoint')
       expect(res.statusCode).to.equal(200)
-      request
-        .get(`${uri}/purge/${postRoute}`, (err, res, body) => {
-          const purgeResponse = JSON.stringify({ status: `Purged ${postRoute}` })
-          expect(body).to.contain(purgeResponse)
-          expect(res.statusCode).to.equal(200)
-          done()
-        })
+
+      request.get(`${uri}/purge/${route}`, (err, res, body) => {
+        const cacheApi = cacheManager.getCache('api')
+        expect(body).to.contain(JSON.stringify(purgeResp))
+        expect(res.statusCode).to.equal(200)
+        expect(cacheApi.keys()).to.not.contain('pages?slug=test')
+
+        done()
+      })
     })
   })
 })
diff --git a/test/tests/component.test.js b/test/tests/component.test.js
index 995e8ba..bef6e37 100644
--- a/test/tests/component.test.js
+++ b/test/tests/component.test.js
@@ -1,4 +1,5 @@
 import React from 'react'
+import HTTPStatus from 'http-status'
 import Helmet from 'react-helmet'
 import { expect } from 'chai'
 import request from 'request'
@@ -140,60 +141,97 @@ describe('Error view rendering', () => {
       .reply(200, dataPosts.data)
       .get('/wp-json/wp/v2/posts?slug=slug&_embed')
       .reply(200, dataPage)
+      .get('/wp-json/wp/v2/pages?slug=404-route&_embed')
+      .times(5)
+      .reply(404, { data: { status: 404 } })
     done()
   })
 
   afterEach(() => tapestry.server.stop())
 
-  it('CustomError missing in DEV, render Missing View', (done) => {
+  it('Show MissingView in DEV if component missing', (done) => {
     tapestry = bootServer(config)
     tapestry.server.on('start', () => {
       request
         .get(tapestry.server.info.uri, (err, res, body) => {
-          expect(body).to.contain('Missing Component')
+          expect(body).to.contain('Missing component')
           done()
         })
     })
   })
 
-  it('CustomError declared in DEV, render Missing View', (done) => {
+  it('Show DefaultError in PROD if component missing', (done) => {
+    tapestry = bootServer(config, { __DEV__: false })
+    tapestry.server.on('start', () => {
+      request
+        .get(tapestry.server.info.uri, (err, res, body) => {
+          expect(body).to.contain('Application Error')
+          done()
+        })
+    })
+  })
+
+  it('Show DefaultError if API 404', (done) => {
     tapestry = bootServer({
       ...config,
-      components: {
-        CustomError: () => <p>Custom Error</p>
-      }
+      components: { Page: () => <p>Hello</p> }
+    })
+    tapestry.server.on('start', () => {
+      request
+        .get(`${tapestry.server.info.uri}/404-route`, (err, res, body) => {
+          expect(body).to.contain(404)
+          expect(body).to.contain(HTTPStatus[404])
+          done()
+        })
+    })
+  })
+
+  it('Show DefaultError if route 404', (done) => {
+    tapestry = bootServer({
+      ...config,
+      components: { Page: () => <p>Hello</p> }
     })
     tapestry.server.on('start', () => {
       request
         .get(`${tapestry.server.info.uri}/route/not/matched/in/any/way`, (err, res, body) => {
-          expect(body).to.contain('Missing Component')
+          expect(body).to.contain(404)
+          expect(body).to.contain(HTTPStatus[404])
           done()
         })
     })
   })
 
-  it('CustomError missing in PROD, render Default Error', (done) => {
-    tapestry = bootServer(config, { __DEV__: false })
+  it('Show CustomError if defined', (done) => {
+    tapestry = bootServer({
+      ...config,
+      components: {
+        CustomError: () => <p>Custom Error</p>,
+        Page: () => <p>Hello</p>
+      }
+    })
     tapestry.server.on('start', () => {
       request
-        .get(tapestry.server.info.uri, (err, res, body) => {
-          expect(body).to.contain('Application Error')
+        .get(`${tapestry.server.info.uri}/404-route`, (err, res, body) => {
+          expect(body).to.contain('Custom Error')
           done()
         })
     })
   })
 
-  it('CustomError declared in PROD, render CustomError', (done) => {
+  it('Status code and message are available to CustomError', (done) => {
     tapestry = bootServer({
       ...config,
       components: {
-        CustomError: () => <p>Custom Error</p>
+        CustomError: ({ code, message }) => <p>Custom Error {code} {message}</p>,
+        Page: () => <p>Hello</p>
       }
-    }, { __DEV__: false })
+    })
     tapestry.server.on('start', () => {
       request
-        .get(`${tapestry.server.info.uri}/route/not/matched/in/any/way`, (err, res, body) => {
+        .get(`${tapestry.server.info.uri}/404-route`, (err, res, body) => {
           expect(body).to.contain('Custom Error')
+          expect(body).to.contain('404')
+          expect(body).to.contain('Not Found')
           done()
         })
     })
diff --git a/test/tests/response.test.js b/test/tests/response.test.js
index 9d3cd7d..4b5f6b0 100644
--- a/test/tests/response.test.js
+++ b/test/tests/response.test.js
@@ -12,9 +12,24 @@ describe('Handing server responses', () => {
   let tapestry = null
   let uri = null
   let config = {
-    components: {
-      FrontPage: () => <p>Hello</p>
-    },
+    routes: [{
+      path: '/',
+      endpoint: 'posts?_embed',
+      component: () => <p>Hello</p>
+    }, {
+      path: '/404-response',
+      endpoint: 'pages?slug=404-response',
+      component: () => <p>Hello</p>
+    }, {
+      path: '/empty-response',
+      endpoint: 'pages?slug=empty-response',
+      component: () => <p>Hello</p>
+    }, {
+      path: '/empty-allowed-response',
+      endpoint: 'pages?slug=empty-response',
+      options: { allowEmptyResponse: true },
+      component: () => <p>Hello</p>
+    }],
     siteUrl: 'http://dummy.api'
   }
 
@@ -24,8 +39,12 @@ describe('Handing server responses', () => {
       .get('/wp-json/wp/v2/posts?_embed')
       .times(5)
       .reply(200, dataPosts.data)
-      .get('/wp-json/wp/v2/pages?slug=page&_embed')
+      .get('/wp-json/wp/v2/pages?slug=404-response')
+      .times(5)
       .reply(404, { data: { status: 404 } })
+      .get('/wp-json/wp/v2/pages?slug=empty-response')
+      .times(5)
+      .reply(200, [])
     // boot tapestry server
     tapestry = bootServer(config)
     tapestry.server.on('start', () => {
@@ -58,11 +77,27 @@ describe('Handing server responses', () => {
       })
   })
 
-  it('Route matched but API 404, status code is 404', (done) => {
+  it('Route matched, API 404, status code is 404', (done) => {
     request
-      .get(`${uri}/about/page`, (err, res) => {
+      .get(`${uri}/404-response`, (err, res) => {
         expect(res.statusCode).to.equal(404)
         done()
       })
   })
+
+  it('Route matched, API empty response, status code is 404', (done) => {
+    request
+      .get(`${uri}/empty-response`, (err, res) => {
+        expect(res.statusCode).to.equal(404)
+        done()
+      })
+  })
+
+  it('Route matched, API empty but allowed, status code is 200', (done) => {
+    request
+      .get(`${uri}/empty-allowed-response`, (err, res) => {
+        expect(res.statusCode).to.equal(200)
+        done()
+      })
+  })
 })
diff --git a/yarn.lock b/yarn.lock
index df09106..0e4cd8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -84,7 +84,7 @@ ansi-escapes@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-2.0.0.tgz#5bae52be424878dd9783e8910e3fc2922e83c81b"
 
-ansi-regex@*, ansi-regex@^2.0.0:
+ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
@@ -1443,7 +1443,7 @@ debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
   dependencies:
     ms "2.0.0"
 
-debuglog@*, debuglog@^1.0.1:
+debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
 
@@ -2633,6 +2633,10 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+http-status@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/http-status/-/http-status-1.0.1.tgz#dc43001a8bfc50ac87d485a892f7578964bc94a2"
+
 https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
@@ -2667,7 +2671,7 @@ ignore@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d"
 
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
@@ -3322,10 +3326,6 @@ lodash._basefor@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
 
-lodash._baseindexof@*:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
-
 lodash._baseuniq@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.4.0.tgz#a445294347a2f5311f585fe3225644530b9b8fae"
@@ -3340,14 +3340,10 @@ lodash._baseuniq@~4.5.0:
     lodash._createset "~4.0.0"
     lodash._setcache "~4.1.0"
 
-lodash._bindcallback@*, lodash._bindcallback@^3.0.0:
+lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
 
-lodash._cacheindexof@*:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
-
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
@@ -3356,17 +3352,11 @@ lodash._createassigner@^3.0.0:
     lodash._isiterateecall "^3.0.0"
     lodash.restparam "^3.0.0"
 
-lodash._createcache@*:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
-  dependencies:
-    lodash._getnative "^3.0.0"
-
 lodash._createset@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
 
-lodash._getnative@*, lodash._getnative@^3.0.0:
+lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
@@ -3491,7 +3481,7 @@ lodash.rest@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/lodash.rest/-/lodash.rest-4.0.5.tgz#954ef75049262038c96d1fc98b28fdaf9f0772aa"
 
-lodash.restparam@*, lodash.restparam@^3.0.0:
+lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
 
@@ -3611,7 +3601,7 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-"micromatch@github:jonschlinkert/micromatch#2.2.0":
+micromatch@jonschlinkert/micromatch#2.2.0:
   version "2.2.0"
   resolved "https://codeload.github.com/jonschlinkert/micromatch/tar.gz/b0ac0b7cea8d90f97630c027d0116a8aef06bfdc"
   dependencies:
@@ -4815,7 +4805,7 @@ readable-stream@~2.1.5:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
   dependencies:
@@ -5371,7 +5361,7 @@ stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
-strip-ansi@*, strip-ansi@^3.0.0, strip-ansi@^3.0.1, strip-ansi@~3.0.1:
+strip-ansi@^3.0.0, strip-ansi@^3.0.1, strip-ansi@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   dependencies:
@@ -5689,7 +5679,7 @@ v8flags@^2.0.10:
   dependencies:
     user-home "^1.1.1"
 
-validate-npm-package-license@*, validate-npm-package-license@^3.0.1, validate-npm-package-license@~3.0.1:
+validate-npm-package-license@^3.0.1, validate-npm-package-license@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
   dependencies: