diff --git a/avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java b/avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java
index 17afaf1fd..352552294 100644
--- a/avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java
+++ b/avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java
@@ -7,7 +7,6 @@
 
 import tools.jackson.databind.BeanDescription;
 import tools.jackson.databind.SerializationConfig;
-import tools.jackson.databind.introspect.AnnotatedClass;
 import tools.jackson.databind.ser.BeanPropertyWriter;
 import tools.jackson.databind.ser.ValueSerializerModifier;
 
@@ -24,14 +23,13 @@ public class AvroSerializerModifier
 
     @Override
     public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
-            BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties)
+            BeanDescription.Supplier beanDescRef, List<BeanPropertyWriter> beanProperties)
     {
-        AnnotatedClass ac = beanDesc.getClassInfo();
         // Couple of ways to determine if it's generated class: main alternative
         // would be to look for annotation `AvroGenerated` but check for base
         // class seems simpler and as robust:
 
-        if (SpecificRecordBase.class.isAssignableFrom(ac.getRawType())) {
+        if (SpecificRecordBase.class.isAssignableFrom(beanDescRef.getBeanClass())) {
             Iterator<BeanPropertyWriter> it = beanProperties.iterator();
             while (it.hasNext()) {
                 BeanPropertyWriter prop = it.next();