killbill-memoizeit

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
index 1f40544..0116a31 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/modules/KillbillServerModule.java
@@ -113,10 +113,6 @@ public class KillbillServerModule extends KillbillPlatformModule {
     protected void configureDao() {
         super.configureDao();
 
-        final Provider<DataSource> dataSourceSpyProvider = new ReferenceableDataSourceSpyProvider(daoConfig, SHIRO_DATA_SOURCE_ID);
-        requestInjection(dataSourceSpyProvider);
-        bind(DataSource.class).annotatedWith(Names.named(SHIRO_DATA_SOURCE_ID)).toProvider(dataSourceSpyProvider).asEagerSingleton();
-
         final Multibinder<ResultSetMapperFactory> resultSetMapperFactorySetBinder = Multibinder.newSetBinder(binder(), ResultSetMapperFactory.class);
         resultSetMapperFactorySetBinder.addBinding().toInstance(new LowerToCamelBeanMapperFactory(SessionModelDao.class));
 

diff --git a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
index 7120f3e..8955201 100644
--- a/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
+++ b/profiles/killbill/src/main/java/org/killbill/billing/server/security/KillbillJdbcTenantRealm.java
@@ -36,9 +36,13 @@ public class KillbillJdbcTenantRealm extends JdbcRealm {
 
     private static final String KILLBILL_AUTHENTICATION_QUERY = "select api_secret, api_salt from tenants where api_key = ?";
 
+    private final DataSource dataSource;
+
     public KillbillJdbcTenantRealm(final DataSource dataSource) {
         super();
 
+        this.dataSource = dataSource;
+
         configureSecurity();
         configureQueries();
         configureDataSource();