adds test case for #69
#69 better caching of self and current collections
update models to the store
Merge pull request #72 from kiva/issue-69

Issue 69