WIP: CAVES integration.

Change-Id: Ib35ba24a36d10815c7d92e3cf0103dc9eaf9a47c