Have added a check for an interface too to be doubly safe, however that particular case is already handled by Neo4jMappingContext.createPersistentEntity.
You are right about the caching, done! (see next commit)