More work.
Add cache properties.