Avoid re-read from DB, required for multi-db setup (#411)