DDC-217 - Refactor result cache again to be much simpler, previous approach was too complicated and something like this needs longer testing. Now only caching the full result.