Comment 6 for bug 1365350

Thanks Rajaneesh for working on this!

To answer your questions: I would recommend not to chose option #1 because it changes the behaviour fundamentaly, and this will affect users that rely on this feature.
Option #2 sounds good to me. There is still a small possibility to store more metadata entries due to the eventual consistency, but I think this is the best we can get away with.