LGTM - was about to merge, but I wonder if we should consider adding a `MetadataStore`, perhaps under a well-known bean name, as an option for providing user properties.

We can add it as a separate JIRA if you like.