Template chooser state was not persisted (setting was only updated in cache)