Moved the query caching code underneath the result publish code, as the
caching was increasing the time before the result was returned.