Not caching of empty/error response (fix #19)
resolve merge conflict