CDK-385: Add support for query in opaque URIPattern matches.
CDK-385: Move URI registration to SPI, add return generics.