Clean up from edge case db/cache mismatch, simplify app startup code since doInit only called once now.