Fixes issue where values missing from caching/restriction rules

Also adds the api tests to validate expectations are returned.

Change-Id: Idf504fbd5fbafb03d7baf4571eb6dbeedbcab771
Closes-Bug: 1401642
Merge "Fixes issue where values missing from caching/restriction rules"