Optimize content load.
Prevent duplicate retrieve of store content.
Merge pull request #524 from gsn/master

Merged from beta.