diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
index f237f63d83..310e24b9cc 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClass.java
@@ -660,7 +660,7 @@ public Set<ReferencedClassObject> getReferencedClassObjects() {
     }
 
     @PublicAPI(usage = ACCESS)
-    public Set<TypeCast> getypeCast() {
+    public Set<TypeCast> getypeCasts() {
         return members.getTypeCast();
     }
 
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java
index 0212539efa..42e24ac2eb 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/JavaClassDependencies.java
@@ -221,7 +221,7 @@ private Set<Dependency> referencedClassObjectDependenciesFromSelf() {
 
     private Set<Dependency> typeCastDependenciesFromSelf() {
         ImmutableSet.Builder<Dependency> result = ImmutableSet.builder();
-        for (TypeCast typeCast : javaClass.getypeCast()) {
+        for (TypeCast typeCast : javaClass.getypeCasts()) {
             result.addAll(Dependency.tryCreateFromTypeCast(typeCast));
         }
         return result.build();
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/TypeCast.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/TypeCast.java
index 24cf83f46f..00331b27ae 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/domain/TypeCast.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/domain/TypeCast.java
@@ -29,13 +29,11 @@ public final class TypeCast implements HasType, HasOwner<JavaCodeUnit>, HasSourc
 
     private final JavaCodeUnit owner;
     private final JavaClass value;
-    private final int lineNumber;
     private final SourceCodeLocation sourceCodeLocation;
 
     private TypeCast(JavaCodeUnit owner, JavaClass value, int lineNumber) {
         this.owner = checkNotNull(owner);
         this.value = checkNotNull(value);
-        this.lineNumber = lineNumber;
         sourceCodeLocation = SourceCodeLocation.of(owner.getOwner(), lineNumber);
     }
 
@@ -57,11 +55,6 @@ public JavaCodeUnit getOwner() {
         return owner;
     }
 
-    @PublicAPI(usage = ACCESS)
-    public int getLineNumber() {
-        return lineNumber;
-    }
-
     @Override
     public SourceCodeLocation getSourceCodeLocation() {
         return sourceCodeLocation;
@@ -72,7 +65,6 @@ public String toString() {
         return toStringHelper(this)
                 .add("owner", owner)
                 .add("target", value)
-                .add("lineNumber", lineNumber)
                 .toString();
     }
 
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
index cec0d13d4a..07a599f726 100644
--- a/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
+++ b/archunit/src/main/java/com/tngtech/archunit/core/importer/DomainBuilders.java
@@ -34,14 +34,42 @@
 import com.tngtech.archunit.base.Function;
 import com.tngtech.archunit.base.HasDescription;
 import com.tngtech.archunit.base.Optional;
-import com.tngtech.archunit.core.domain.*;
+import com.tngtech.archunit.core.domain.AccessTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.CodeUnitAccessTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.ConstructorCallTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.ConstructorReferenceTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.FieldAccessTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.MethodCallTarget;
 import com.tngtech.archunit.core.domain.AccessTarget.MethodReferenceTarget;
+import com.tngtech.archunit.core.domain.DomainObjectCreationContext;
+import com.tngtech.archunit.core.domain.Formatters;
+import com.tngtech.archunit.core.domain.InstanceofCheck;
+import com.tngtech.archunit.core.domain.TypeCast;
+import com.tngtech.archunit.core.domain.JavaAnnotation;
+import com.tngtech.archunit.core.domain.JavaClass;
+import com.tngtech.archunit.core.domain.JavaClassDescriptor;
+import com.tngtech.archunit.core.domain.JavaCodeUnit;
+import com.tngtech.archunit.core.domain.JavaConstructor;
+import com.tngtech.archunit.core.domain.JavaConstructorCall;
+import com.tngtech.archunit.core.domain.JavaConstructorReference;
+import com.tngtech.archunit.core.domain.JavaEnumConstant;
+import com.tngtech.archunit.core.domain.JavaField;
+import com.tngtech.archunit.core.domain.JavaFieldAccess;
 import com.tngtech.archunit.core.domain.JavaFieldAccess.AccessType;
+import com.tngtech.archunit.core.domain.JavaMember;
+import com.tngtech.archunit.core.domain.JavaMethod;
+import com.tngtech.archunit.core.domain.JavaMethodCall;
+import com.tngtech.archunit.core.domain.JavaMethodReference;
+import com.tngtech.archunit.core.domain.JavaModifier;
+import com.tngtech.archunit.core.domain.JavaParameter;
+import com.tngtech.archunit.core.domain.JavaParameterizedType;
+import com.tngtech.archunit.core.domain.JavaStaticInitializer;
+import com.tngtech.archunit.core.domain.JavaType;
+import com.tngtech.archunit.core.domain.JavaTypeVariable;
+import com.tngtech.archunit.core.domain.JavaWildcardType;
+import com.tngtech.archunit.core.domain.ReferencedClassObject;
+import com.tngtech.archunit.core.domain.Source;
+import com.tngtech.archunit.core.domain.ThrowsClause;
 import com.tngtech.archunit.core.domain.properties.HasTypeParameters;
 
 import static com.google.common.base.Preconditions.checkArgument;