reverted .upper() in hashes
 reverted ugly workaround for unpickleable generatro