diff --git a/jOOQ/src/main/java/org/jooq/ConverterProvider.java b/jOOQ/src/main/java/org/jooq/ConverterProvider.java
index 6552047500..9a1e01d2b1 100644
--- a/jOOQ/src/main/java/org/jooq/ConverterProvider.java
+++ b/jOOQ/src/main/java/org/jooq/ConverterProvider.java
@@ -37,6 +37,8 @@
*/
package org.jooq;
+import org.jooq.impl.DefaultConverterProvider;
+
/**
* A ConverterProvider provides {@link Converter} implementations
* for any combination of types <T> and
@@ -46,6 +48,10 @@ package org.jooq;
* {@link RecordMapper}, e.g. when mapping {@link JSON} or {@link XML} data
* types onto POJO types using third party libraries like Jackson, Gson, JAXB,
* or others.
+ *
+ * It is recommended to delegate all calls to
+ * {@link DefaultConverterProvider#provide(Class, Class)} for pairs of classes
+ * that are not handled by this converter provider.
*
* @author Lukas Eder
*/
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
index aba29fd7ed..dc5dfd740a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConverterProvider.java
@@ -46,10 +46,10 @@ import org.jooq.tools.Convert;
*
* @author Lukas Eder
*/
-public class DefaultConverterProvider implements ConverterProvider {
+public final class DefaultConverterProvider implements ConverterProvider {
@Override
- public