simpler cache mechanism - removed root keys
Merge branch 'staging'