Make results cacheable

Change-Id: I836c15221c043be2c73a4c77b572a0fc52f01b82
Merge "Make results cacheable"