Moved the Store interface to a real key/value store

I don't think these should store URI's (or that we should ever use it for anything other than parsing).