improved state storage usage

also make the assumption that etag is a md5 hash