Make DataModelOracle service re-use Builder cache