Prevent duplicate retrieve of store content.
Merge pull request #523 from gsn/master

Prevent duplicate retrieve of store content.