diff --git a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
index ef408da..122470d 100644
--- a/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
+++ b/src/main/java/org/springframework/data/ldap/repository/cdi/LdapRepositoryBean.java
@@ -63,13 +63,19 @@ public class LdapRepositoryBean<T> extends CdiRepositoryBean<T> {
 	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
 	 */
 	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType,
-			Optional<Object> customImplementation) {
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 
 		LdapOperations ldapOperations = getDependencyInstance(operations, LdapOperations.class);
-		LdapRepositoryFactory factory = new LdapRepositoryFactory(ldapOperations);
 
-		return customImplementation.map(o -> factory.getRepository(repositoryType, o))
-				.orElseGet(() -> factory.getRepository(repositoryType));
+		return create(() -> new LdapRepositoryFactory(ldapOperations), repositoryType);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#getScope()
+	 */
+	@Override
+	public Class<? extends Annotation> getScope() {
+		return operations.getScope();
 	}
 }
diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryCustom.java b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragment.java
similarity index 95%
rename from src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryCustom.java
rename to src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragment.java
index 838326e..2dbce86 100644
--- a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryCustom.java
+++ b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragment.java
@@ -18,7 +18,7 @@ package org.springframework.data.ldap.repository.cdi;
 /**
  * @author Mark Paluch
  */
-interface SampleRepositoryCustom {
+interface SampleFragment {
 
 	int returnOne();
 }
diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryImpl.java b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragmentImpl.java
similarity index 92%
rename from src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryImpl.java
rename to src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragmentImpl.java
index 47d6fc5..ff6bbfb 100644
--- a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepositoryImpl.java
+++ b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleFragmentImpl.java
@@ -18,7 +18,7 @@ package org.springframework.data.ldap.repository.cdi;
 /**
  * @author Mark Paluch
  */
-class SampleRepositoryImpl implements SampleRepositoryCustom {
+class SampleFragmentImpl implements SampleFragment {
 
 	@Override
 	public int returnOne() {
diff --git a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepository.java b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepository.java
index ff65632..bd498e8 100644
--- a/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepository.java
+++ b/src/test/java/org/springframework/data/ldap/repository/cdi/SampleRepository.java
@@ -23,4 +23,4 @@ import org.springframework.data.repository.CrudRepository;
 /**
  * @author Mark Paluch
  */
-public interface SampleRepository extends CrudRepository<DummyEntity, Name>, SampleRepositoryCustom {}
+public interface SampleRepository extends CrudRepository<DummyEntity, Name>, SampleFragment {}