Add support for result cache