DDC-217 - Refactor result caching to use a value object for all the important information which simplifies the code considerably and makes caching more powerful.