[next] Avoid expensive index recreation

[backportbot[bot]]

Backport of #3694

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

• [ ] Review and resolve any conflicts

• [ ] Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.