Sync usage fixes
Merge pull request #1559 from pravisankar/dev/ravi/usage-fixes

Merged by openshift-bot
Merge pull request #1564 from danmcp/master

Bug 918480
be sure you dont cache an empty list