Make results cacheable

Change-Id: Ibae883e2bf76d0dc0b6d99d3fbfa5e34050a6789
Merge "Make results cacheable"