Simplify cache builder

Change-Id: I4800e944cd5afa21fb15c8a499807ed112d9bd54
Update fricassée syntax

Change-Id: I99f41b43c8afc54ed668182efbe72ff031404626