Fix #59 - cache
Fix #56 - store does not meddle with cache