Make results cacheable

Change-Id: I836c15221c043be2c73a4c77b572a0fc52f01b82
(cherry picked from commit 863affef3d4f006b5924db0193fd7e78fd888bd6)