Make results cacheable

Change-Id: Ibae883e2bf76d0dc0b6d99d3fbfa5e34050a6789
(cherry picked from commit 9f2accbccec1f5ded9db35448bfcf0857387fc64)