Cleaner cache clearing on save
Changed 'href's to HREF_PROP_NAME in data store class