Update to handle no thread cache,
Update to use Machine Name in db name