avoid large cache entries in goo
Merge branch 'staging'