Implement better conformance to the dojo object store API, fixes #17866