Merge "Set rcode correctly for caching hit"