diff --git a/pom.xml b/pom.xml
index b1c0ec0..fb81625 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
 <!--
   ~ Copyright 2010-2014 Ning, Inc.
   ~ Copyright 2014-2020 Groupon, Inc
-  ~ Copyright 2020-2022 Equinix, Inc
-  ~ Copyright 2014-2022 The Billing Project, LLC
+  ~ Copyright 2020-2023 Equinix, Inc
+  ~ Copyright 2014-2023 The Billing Project, LLC
   ~
   ~ The Billing Project licenses this file to you under the Apache License, version 2.0
   ~ (the "License"); you may not use this file except in compliance with the
@@ -193,6 +193,11 @@
             <artifactId>killbill-platform-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.kill-bill.billing.plugin</groupId>
+            <artifactId>killbill-plugin-api-currency</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin</groupId>
             <artifactId>killbill-plugin-api-notification</artifactId>
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
index a01bf81..e36a0cd 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsActivator.java
@@ -26,6 +26,7 @@
 import javax.servlet.Servlet;
 import javax.servlet.http.HttpServlet;
 
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.osgi.api.Healthcheck;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
 import org.killbill.billing.osgi.libs.killbill.KillbillActivatorBase;
@@ -58,6 +59,7 @@
 import org.killbill.notificationq.api.NotificationQueueConfig;
 import org.killbill.notificationq.dao.NotificationEventModelDao;
 import org.osgi.framework.BundleContext;
+import org.osgi.util.tracker.ServiceTracker;
 import org.skife.config.ConfigurationObjectFactory;
 import org.skife.jdbi.v2.DBI;
 import org.slf4j.Logger;
@@ -73,8 +75,11 @@ public class AnalyticsActivator extends KillbillActivatorBase {
 
     public static final String PLUGIN_NAME = "killbill-analytics";
     public static final String ANALYTICS_QUEUE_SERVICE = "AnalyticsService";
+
     private static final Logger logger = LoggerFactory.getLogger(AnalyticsActivator.class);
+
     private AnalyticsConfigurationHandler analyticsConfigurationHandler;
+    private ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker;
     private AnalyticsListener analyticsListener;
     private JobsScheduler jobsScheduler;
     private ReportsUserApi reportsUserApi;
@@ -126,10 +131,15 @@ public void start(final BundleContext context) throws Exception {
                 locker = new MemoryGlobalLocker();
                 break;
         }
+
+        currencyPluginApiServiceTracker = new ServiceTracker<>(context, CurrencyPluginApi.class, null);
+        currencyPluginApiServiceTracker.open();
+
         analyticsListener = new AnalyticsListener(roOSGIkillbillAPI,
                                                   dataSource,
                                                   metricRegistry,
                                                   configProperties,
+                                                  currencyPluginApiServiceTracker,
                                                   executor,
                                                   locker,
                                                   killbillClock,
@@ -140,7 +150,7 @@ public void start(final BundleContext context) throws Exception {
 
         final ReportsConfiguration reportsConfiguration = new ReportsConfiguration(dataSource, metricRegistry, jobsScheduler);
 
-        final AnalyticsUserApi analyticsUserApi = new AnalyticsUserApi(roOSGIkillbillAPI, dataSource, metricRegistry, configProperties, executor, killbillClock, analyticsConfigurationHandler, analyticsListener);
+        final AnalyticsUserApi analyticsUserApi = new AnalyticsUserApi(roOSGIkillbillAPI, dataSource, metricRegistry, configProperties, currencyPluginApiServiceTracker, executor, killbillClock, analyticsConfigurationHandler, analyticsListener);
         reportsUserApi = new ReportsUserApi(roOSGIkillbillAPI, dataSource, metricRegistry, configProperties, dbEngine, reportsConfiguration, jobsScheduler, analyticsConfigurationHandler);
 
         final AnalyticsHealthcheck healthcheck = new AnalyticsHealthcheck(analyticsListener, jobsScheduler);
@@ -175,6 +185,9 @@ public void stop(final BundleContext context) throws Exception {
         if (jobsScheduler != null) {
             jobsScheduler.shutdownNow();
         }
+        if (currencyPluginApiServiceTracker != null) {
+            currencyPluginApiServiceTracker.close();
+        }
         if (analyticsListener != null) {
             // Little bit of subtlety here, which is queue implementation dependent: only the second time
             // the queue is asked to stop that it will actually go through the shutdown sequence
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
index be847a2..82c815d 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/AnalyticsListener.java
@@ -29,6 +29,7 @@
 
 import org.joda.time.DateTime;
 import org.killbill.billing.ObjectType;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.invoice.api.Invoice;
 import org.killbill.billing.invoice.api.InvoiceApiException;
 import org.killbill.billing.notification.plugin.api.ExtBusEvent;
@@ -65,6 +66,7 @@
 import org.killbill.notificationq.api.NotificationQueue;
 import org.killbill.notificationq.api.NotificationQueueService.NotificationQueueAlreadyExists;
 import org.killbill.notificationq.api.NotificationQueueService.NotificationQueueHandler;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -93,6 +95,7 @@ public class AnalyticsListener implements OSGIKillbillEventDispatcher.OSGIKillbi
     private final BusinessAccountTransitionDao bosDao;
     private final BusinessFieldDao bFieldDao;
     private final AllBusinessObjectsDao allBusinessObjectsDao;
+    private final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker;
     private final CurrencyConversionDao currencyConversionDao;
     private final NotificationQueue jobQueue;
     private final GlobalLocker locker;
@@ -103,6 +106,7 @@ public AnalyticsListener(final OSGIKillbillAPI osgiKillbillAPI,
                              final OSGIKillbillDataSource osgiKillbillDataSource,
                              final OSGIMetricRegistry metricRegistry,
                              final OSGIConfigPropertiesService osgiConfigPropertiesService,
+                             final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker,
                              final Executor executor,
                              final GlobalLocker locker,
                              final Clock clock,
@@ -110,6 +114,7 @@ public AnalyticsListener(final OSGIKillbillAPI osgiKillbillAPI,
                              final DefaultNotificationQueueService notificationQueueService) throws NotificationQueueAlreadyExists {
         this.osgiKillbillAPI = osgiKillbillAPI;
         this.osgiConfigPropertiesService = osgiConfigPropertiesService;
+        this.currencyPluginApiServiceTracker = currencyPluginApiServiceTracker;
         this.locker = locker;
         this.clock = clock;
         this.analyticsConfigurationHandler = analyticsConfigurationHandler;
@@ -346,7 +351,7 @@ private void handleAnalyticsJobWithLock(final AnalyticsJob job) throws Analytics
         }
 
         final CallContext callContext = new AnalyticsCallContext(job, clock);
-        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(job.getAccountId(), callContext, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(job.getAccountId(), callContext, currencyPluginApiServiceTracker, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
 
         // Pre 7.2.4, the group wasn't stored in the event
         final Group group = MoreObjects.firstNonNull(job.getGroup(), AnalyticsJobHierarchy.fromEventType(job.getEventType()));
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/api/user/AnalyticsUserApi.java b/src/main/java/org/killbill/billing/plugin/analytics/api/user/AnalyticsUserApi.java
index eb0d156..3c0fde0 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/api/user/AnalyticsUserApi.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/api/user/AnalyticsUserApi.java
@@ -27,6 +27,7 @@
 
 import org.killbill.billing.ObjectType;
 import org.killbill.billing.account.api.Account;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.notification.plugin.api.ExtBusEventType;
 import org.killbill.billing.osgi.libs.killbill.OSGIConfigPropertiesService;
 import org.killbill.billing.osgi.libs.killbill.OSGIKillbillAPI;
@@ -55,6 +56,7 @@
 import org.killbill.billing.util.callcontext.TenantContext;
 import org.killbill.billing.util.entity.Pagination;
 import org.killbill.clock.Clock;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,6 +70,7 @@ public class AnalyticsUserApi {
     private final AnalyticsConfigurationHandler analyticsConfigurationHandler;
     private final AnalyticsDao analyticsDao;
     private final AllBusinessObjectsDao allBusinessObjectsDao;
+    private final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker;
     private final CurrencyConversionDao currencyConversionDao;
     private final AnalyticsListener analyticsListener;
 
@@ -75,19 +78,20 @@ public AnalyticsUserApi(final OSGIKillbillAPI osgiKillbillAPI,
                             final OSGIKillbillDataSource osgiKillbillDataSource,
                             final OSGIMetricRegistry metricRegistry,
                             final OSGIConfigPropertiesService osgiConfigPropertiesService,
+                            final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker,
                             final Executor executor,
                             final Clock clock,
                             final AnalyticsConfigurationHandler analyticsConfigurationHandler,
                             final AnalyticsListener analyticsListener) {
         this.osgiKillbillAPI = osgiKillbillAPI;
         this.osgiConfigPropertiesService = osgiConfigPropertiesService;
+        this.currencyPluginApiServiceTracker = currencyPluginApiServiceTracker;
         this.clock = clock;
         this.analyticsConfigurationHandler = analyticsConfigurationHandler;
         this.analyticsDao = new AnalyticsDao(osgiKillbillAPI, osgiKillbillDataSource, metricRegistry);
         this.allBusinessObjectsDao = new AllBusinessObjectsDao(osgiKillbillDataSource, metricRegistry, executor);
         this.currencyConversionDao = new CurrencyConversionDao(osgiKillbillDataSource, metricRegistry);
         this.analyticsListener = analyticsListener;
-
     }
 
     public BusinessSnapshot getBusinessSnapshot(final UUID accountId, final TenantContext context) {
@@ -124,7 +128,7 @@ public BusinessSnapshot getBusinessSnapshot(final UUID accountId, final TenantCo
     }
 
     public void rebuildAnalyticsForAccount(final UUID accountId, final CallContext context) throws AnalyticsRefreshException {
-        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(accountId, context, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(accountId, context, currencyPluginApiServiceTracker, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
         logger.info("Starting Analytics refresh for account {}", businessContextFactory.getAccountId());
         // TODO Should we take the account lock?
         allBusinessObjectsDao.update(businessContextFactory);
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessContextFactory.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessContextFactory.java
index 1360f28..daf03be 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessContextFactory.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessContextFactory.java
@@ -1,8 +1,8 @@
 /*
  * Copyright 2010-2014 Ning, Inc.
  * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -31,6 +31,7 @@
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanPhase;
 import org.killbill.billing.catalog.api.VersionedCatalog;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.entitlement.api.BlockingState;
 import org.killbill.billing.entitlement.api.Subscription;
 import org.killbill.billing.entitlement.api.SubscriptionBundle;
@@ -54,6 +55,7 @@
 import org.killbill.billing.util.tag.Tag;
 import org.killbill.billing.util.tag.TagDefinition;
 import org.killbill.clock.Clock;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -116,12 +118,13 @@ public class BusinessContextFactory extends BusinessFactoryBase {
 
     public BusinessContextFactory(final UUID accountId,
                                   final CallContext callContext,
+                                  final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker,
                                   final CurrencyConversionDao currencyConversionDao,
                                   final OSGIKillbillAPI osgiKillbillAPI,
                                   final OSGIConfigPropertiesService osgiConfigPropertiesService,
                                   final Clock clock,
                                   final AnalyticsConfigurationHandler analyticsConfigurationHandler) throws AnalyticsRefreshException {
-        super(accountId, callContext, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        super(accountId, callContext, currencyPluginApiServiceTracker, currencyConversionDao, osgiKillbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
         this.analyticsConfigurationHandler = analyticsConfigurationHandler;
 
         // Always needed
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
index 5b88638..35b7974 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessFactoryBase.java
@@ -1,8 +1,8 @@
 /*
  * Copyright 2010-2014 Ning, Inc.
  * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -38,9 +38,11 @@
 import org.killbill.billing.account.api.AccountUserApi;
 import org.killbill.billing.catalog.api.CatalogApiException;
 import org.killbill.billing.catalog.api.CatalogUserApi;
+import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.catalog.api.Plan;
 import org.killbill.billing.catalog.api.PlanPhase;
 import org.killbill.billing.catalog.api.VersionedCatalog;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.entitlement.api.BlockingState;
 import org.killbill.billing.entitlement.api.EntitlementApiException;
 import org.killbill.billing.entitlement.api.Subscription;
@@ -65,7 +67,10 @@
 import org.killbill.billing.plugin.analytics.api.core.AnalyticsConfigurationHandler;
 import org.killbill.billing.plugin.analytics.dao.CurrencyConversionDao;
 import org.killbill.billing.plugin.analytics.dao.model.BusinessModelDaoBase.ReportGroup;
+import org.killbill.billing.plugin.analytics.utils.CurrencyConversions;
 import org.killbill.billing.plugin.analytics.utils.CurrencyConverter;
+import org.killbill.billing.plugin.analytics.utils.CurrencyPluginApiCurrencyConversions;
+import org.killbill.billing.plugin.analytics.utils.StaticCurrencyConversions;
 import org.killbill.billing.util.api.AuditLevel;
 import org.killbill.billing.util.api.AuditUserApi;
 import org.killbill.billing.util.api.CustomFieldUserApi;
@@ -82,6 +87,7 @@
 import org.killbill.billing.util.tag.Tag;
 import org.killbill.billing.util.tag.TagDefinition;
 import org.killbill.clock.Clock;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -108,10 +114,12 @@ public abstract class BusinessFactoryBase {
 
     private final boolean highCardinalityAccount;
     private final String referenceCurrency;
+    private final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker;
     private final CurrencyConversionDao currencyConversionDao;
 
     public BusinessFactoryBase(final UUID accountId,
                                final CallContext callContext,
+                               final ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker,
                                final CurrencyConversionDao currencyConversionDao,
                                final OSGIKillbillAPI osgiKillbillAPI,
                                final OSGIConfigPropertiesService osgiConfigPropertiesService,
@@ -119,6 +127,7 @@ public BusinessFactoryBase(final UUID accountId,
                                final AnalyticsConfigurationHandler analyticsConfigurationHandler) {
         this.accountId = accountId;
         this.callContext = callContext;
+        this.currencyPluginApiServiceTracker = currencyPluginApiServiceTracker;
         this.osgiKillbillAPI = osgiKillbillAPI;
         this.clock = clock;
         this.referenceCurrency = MoreObjects.firstNonNull(Strings.emptyToNull(osgiConfigPropertiesService.getString(ANALYTICS_REFERENCE_CURRENCY_PROPERTY)), "USD");
@@ -136,7 +145,16 @@ public boolean highCardinalityAccount() {
     //
 
     protected CurrencyConverter getCurrencyConverter() {
-        return new CurrencyConverter(clock, referenceCurrency, currencyConversionDao.getCurrencyConversions(referenceCurrency));
+        return new CurrencyConverter(clock, referenceCurrency, getCurrencyConversions());
+    }
+
+    protected CurrencyConversions getCurrencyConversions() {
+        final CurrencyPluginApi currencyPluginApi = currencyPluginApiServiceTracker.getService();
+        if (currencyPluginApi == null) {
+            return new StaticCurrencyConversions(currencyConversionDao.getCurrencyConversions(referenceCurrency));
+        } else {
+            return new CurrencyPluginApiCurrencyConversions(currencyPluginApi, Currency.valueOf(referenceCurrency));
+        }
     }
 
     //
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConversions.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConversions.java
new file mode 100644
index 0000000..89f2fc9
--- /dev/null
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConversions.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.billing.plugin.analytics.utils;
+
+import java.math.BigDecimal;
+
+import org.joda.time.LocalDate;
+
+public interface CurrencyConversions {
+
+    BigDecimal getConvertedValue(BigDecimal value, String currency, LocalDate effectiveDate);
+}
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
index 310cdfa..80e0ef2 100644
--- a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyConverter.java
@@ -1,8 +1,8 @@
 /*
  * Copyright 2010-2014 Ning, Inc.
  * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -38,12 +38,9 @@ public class CurrencyConverter {
 
     private final Clock clock;
     private final String referenceCurrency;
+    private final CurrencyConversions currencyConversions;
 
-    // Map original currency -> currency conversions over time
-    // TODO PIERRE Better representation (heap?)
-    private final Map<String, List<CurrencyConversionModelDao>> currencyConversions;
-
-    public CurrencyConverter(final Clock clock, final String referenceCurrency, final Map<String, List<CurrencyConversionModelDao>> currencyConversions) {
+    public CurrencyConverter(final Clock clock, final String referenceCurrency, final CurrencyConversions currencyConversions) {
         this.clock = clock;
         this.referenceCurrency = referenceCurrency;
         this.currencyConversions = currencyConversions;
@@ -62,25 +59,11 @@ public BigDecimal getConvertedValue(@Nullable final BigDecimal value,
             return value;
         }
 
-        if (value == null || currency == null || effectiveDate == null || currencyConversions.get(currency) == null) {
+        if (value == null || currency == null || effectiveDate == null) {
             return null;
         }
 
-        CurrencyConversionModelDao currencyConversionCandidate = null;
-        for (final CurrencyConversionModelDao currencyConversionModelDao : currencyConversions.get(currency)) {
-            if (!effectiveDate.isBefore(currencyConversionModelDao.getStartDate()) &&
-                !effectiveDate.isAfter(currencyConversionModelDao.getEndDate()) &&
-                // In case of overlapping ranges, use the narrowest one
-                (currencyConversionCandidate == null || currencyConversionModelDao.getStartDate().isAfter(currencyConversionCandidate.getStartDate()))) {
-                currencyConversionCandidate = currencyConversionModelDao;
-            }
-        }
-
-        if (currencyConversionCandidate == null) {
-            return null;
-        } else {
-            return value.multiply(currencyConversionCandidate.getReferenceRate());
-        }
+        return currencyConversions.getConvertedValue(value, currency, effectiveDate);
     }
 
     public String getConvertedCurrency() {
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyPluginApiCurrencyConversions.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyPluginApiCurrencyConversions.java
new file mode 100644
index 0000000..213b06a
--- /dev/null
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/CurrencyPluginApiCurrencyConversions.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.billing.plugin.analytics.utils;
+
+import java.math.BigDecimal;
+import java.util.Set;
+
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDate;
+import org.killbill.billing.catalog.api.Currency;
+import org.killbill.billing.currency.api.Rate;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
+
+public class CurrencyPluginApiCurrencyConversions implements CurrencyConversions {
+
+    private final CurrencyPluginApi currencyPluginApi;
+    private final Currency baseCurrency;
+
+    public CurrencyPluginApiCurrencyConversions(final CurrencyPluginApi currencyPluginApi, final Currency baseCurrency) {
+        this.currencyPluginApi = currencyPluginApi;
+        this.baseCurrency = baseCurrency;
+    }
+
+    @Override
+    public BigDecimal getConvertedValue(final BigDecimal value, final String currency, final LocalDate effectiveDate) {
+        if (currencyPluginApi == null) {
+            return null;
+        }
+
+        final Set<Rate> rates = currencyPluginApi.getRates(baseCurrency, effectiveDate.toDateTimeAtStartOfDay(DateTimeZone.UTC));
+        if (rates == null) {
+            return null;
+        }
+
+        for (final Rate rate : rates) {
+            if (rate.getCurrency().toString().equals(currency)) {
+                return value.multiply(rate.getValue());
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/org/killbill/billing/plugin/analytics/utils/StaticCurrencyConversions.java b/src/main/java/org/killbill/billing/plugin/analytics/utils/StaticCurrencyConversions.java
new file mode 100644
index 0000000..a8a16d1
--- /dev/null
+++ b/src/main/java/org/killbill/billing/plugin/analytics/utils/StaticCurrencyConversions.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
+ *
+ * The Billing Project licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License.  You may obtain a copy of the License at:
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.killbill.billing.plugin.analytics.utils;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import org.joda.time.LocalDate;
+import org.killbill.billing.plugin.analytics.dao.model.CurrencyConversionModelDao;
+
+public class StaticCurrencyConversions implements CurrencyConversions {
+
+    // Map original currency -> currency conversions over time
+    // TODO PIERRE Better representation (heap?)
+    private final Map<String, List<CurrencyConversionModelDao>> currencyConversions;
+
+    public StaticCurrencyConversions(final Map<String, List<CurrencyConversionModelDao>> currencyConversions) {
+        this.currencyConversions = currencyConversions;
+    }
+
+    @Override
+    public BigDecimal getConvertedValue(final BigDecimal value, final String currency, final LocalDate effectiveDate) {
+        CurrencyConversionModelDao currencyConversionCandidate = null;
+        final List<CurrencyConversionModelDao> currencyConversionModelDaos = currencyConversions.get(currency);
+        if (currencyConversionModelDaos == null) {
+            return null;
+        }
+
+        for (final CurrencyConversionModelDao currencyConversionModelDao : currencyConversionModelDaos) {
+            if (!effectiveDate.isBefore(currencyConversionModelDao.getStartDate()) &&
+                !effectiveDate.isAfter(currencyConversionModelDao.getEndDate()) &&
+                // In case of overlapping ranges, use the narrowest one
+                (currencyConversionCandidate == null || currencyConversionModelDao.getStartDate().isAfter(currencyConversionCandidate.getStartDate()))) {
+                currencyConversionCandidate = currencyConversionModelDao;
+            }
+        }
+
+        if (currencyConversionCandidate == null) {
+            return null;
+        } else {
+            return value.multiply(currencyConversionCandidate.getReferenceRate());
+        }
+    }
+}
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
index 008321b..ef37e55 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteNoDB.java
@@ -47,6 +47,7 @@
 import org.killbill.billing.catalog.api.Recurring;
 import org.killbill.billing.catalog.api.StaticCatalog;
 import org.killbill.billing.catalog.api.VersionedCatalog;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.entitlement.api.Subscription;
 import org.killbill.billing.entitlement.api.SubscriptionApi;
 import org.killbill.billing.entitlement.api.SubscriptionBundle;
@@ -108,6 +109,7 @@
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -179,6 +181,7 @@ public abstract class AnalyticsTestSuiteNoDB {
     protected OSGIMetricRegistry metricRegistry;
     protected OSGIConfigPropertiesService osgiConfigPropertiesService;
     protected ExecutorService executor;
+    protected ServiceTracker<CurrencyPluginApi, CurrencyPluginApi> currencyPluginApiServiceTracker;
     protected BusinessContextFactory businessContextFactory;
 
     protected void verifyBusinessEntityBase(final BusinessEntityBase businessEntityBase) {
@@ -673,8 +676,11 @@ public Object answer(final InvocationOnMock invocation) {
         defaultConfigurable.blacklist.add(blackListedAccountId.toString());
         analyticsConfigurationHandler.setDefaultConfigurable(defaultConfigurable);
 
+        currencyPluginApiServiceTracker = Mockito.mock(ServiceTracker.class);
+
         businessContextFactory = new BusinessContextFactory(account.getId(),
                                                             callContext,
+                                                            currencyPluginApiServiceTracker,
                                                             currencyConversionDao,
                                                             killbillAPI,
                                                             osgiConfigPropertiesService,
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteWithEmbeddedDB.java b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
index 9016a3b..0c856b4 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/AnalyticsTestSuiteWithEmbeddedDB.java
@@ -58,7 +58,7 @@ public abstract class AnalyticsTestSuiteWithEmbeddedDB extends AnalyticsTestSuit
     }
 
     protected final Clock clock = new DefaultClock();
-    protected final CurrencyConverter currencyConverter = new CurrencyConverter(clock, "USD", ImmutableMap.<String, List<CurrencyConversionModelDao>>of());
+    protected final CurrencyConverter currencyConverter = new CurrencyConverter(clock, "USD", Mockito.mock());
 
     protected EmbeddedDB embeddedDB;
     protected DBI dbi;
@@ -95,6 +95,7 @@ public void setUp(final ITestContext context) throws Exception {
                                                 killbillDataSource,
                                                 metricRegistry,
                                                 osgiConfigPropertiesService,
+                                                currencyPluginApiServiceTracker,
                                                 executor,
                                                 clock,
                                                 analyticsConfigurationHandler,
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsListener.java b/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsListener.java
index f0e1cb2..0613464 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsListener.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsListener.java
@@ -37,6 +37,7 @@ public void testBlacklist() throws Exception {
                                                                           killbillDataSource,
                                                                           metricRegistry,
                                                                           osgiConfigPropertiesService,
+                                                                          currencyPluginApiServiceTracker,
                                                                           null,
                                                                           locker,
                                                                           clock,
@@ -67,6 +68,7 @@ public void testIgnoredGroups() throws Exception {
                                                                           killbillDataSource,
                                                                           metricRegistry,
                                                                           osgiConfigPropertiesService,
+                                                                          currencyPluginApiServiceTracker,
                                                                           null,
                                                                           locker,
                                                                           clock,
@@ -84,6 +86,7 @@ public void testJobsOverlap() throws Exception {
                                                                           killbillDataSource,
                                                                           metricRegistry,
                                                                           osgiConfigPropertiesService,
+                                                                          currencyPluginApiServiceTracker,
                                                                           null,
                                                                           locker,
                                                                           clock,
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsNotificationQueue.java b/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsNotificationQueue.java
index 7861d9b..2af10d3 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsNotificationQueue.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/TestAnalyticsNotificationQueue.java
@@ -41,6 +41,7 @@ public void testSendOneEvent() throws Exception {
                                                                           killbillDataSource,
                                                                           metricRegistry,
                                                                           osgiConfigPropertiesService,
+                                                                          currencyPluginApiServiceTracker,
                                                                           BusinessExecutor.newCachedThreadPool(osgiConfigPropertiesService),
                                                                           locker,
                                                                           clock,
@@ -74,6 +75,7 @@ public void testVerifyNoDups() throws Exception {
                                                                           killbillDataSource,
                                                                           metricRegistry,
                                                                           osgiConfigPropertiesService,
+                                                                          currencyPluginApiServiceTracker,
                                                                           BusinessExecutor.newCachedThreadPool(osgiConfigPropertiesService),
                                                                           locker,
                                                                           clock,
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/api/user/TestDefaultAnalyticsUserApi.java b/src/test/java/org/killbill/billing/plugin/analytics/api/user/TestDefaultAnalyticsUserApi.java
index f641d90..f6a9ed8 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/api/user/TestDefaultAnalyticsUserApi.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/api/user/TestDefaultAnalyticsUserApi.java
@@ -47,7 +47,7 @@ public void testAccountSnapshot() throws Exception {
                                                                                     reportGroup);
         analyticsSqlDao.create(accountModelDao.getTableName(), accountModelDao, callContext);
 
-        final AnalyticsUserApi analyticsUserApi = new AnalyticsUserApi(killbillAPI, killbillDataSource, metricRegistry, osgiConfigPropertiesService, BusinessExecutor.newCachedThreadPool(osgiConfigPropertiesService), clock, analyticsConfigurationHandler, null);
+        final AnalyticsUserApi analyticsUserApi = new AnalyticsUserApi(killbillAPI, killbillDataSource, metricRegistry, osgiConfigPropertiesService, currencyPluginApiServiceTracker, BusinessExecutor.newCachedThreadPool(osgiConfigPropertiesService), clock, analyticsConfigurationHandler, null);
         final BusinessSnapshot businessSnapshot = analyticsUserApi.getBusinessSnapshot(account.getId(), callContext);
         Assert.assertEquals(businessSnapshot.getBusinessAccount(), new BusinessAccount(accountModelDao));
     }
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/dao/TestBusinessInvoiceDao.java b/src/test/java/org/killbill/billing/plugin/analytics/dao/TestBusinessInvoiceDao.java
index c7a33a3..8e18bdd 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/dao/TestBusinessInvoiceDao.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/dao/TestBusinessInvoiceDao.java
@@ -127,6 +127,7 @@ public void testUpdate() throws AnalyticsRefreshException {
         // Re-create the context to clear caches
         businessContextFactory = new BusinessContextFactory(account.getId(),
                                                             callContext,
+                                                            currencyPluginApiServiceTracker,
                                                             currencyConversionDao,
                                                             killbillAPI,
                                                             osgiConfigPropertiesService,
@@ -238,6 +239,7 @@ public void testUpdateToVoid() throws AnalyticsRefreshException, InvoiceApiExcep
         // Re-create the context to clear caches
         businessContextFactory = new BusinessContextFactory(account.getId(),
                                                             callContext,
+                                                            currencyPluginApiServiceTracker,
                                                             currencyConversionDao,
                                                             killbillAPI,
                                                             osgiConfigPropertiesService,
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessAccountTransitionFactory.java b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessAccountTransitionFactory.java
index 8f2dc05..938247d 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessAccountTransitionFactory.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessAccountTransitionFactory.java
@@ -62,7 +62,7 @@ public void testRespectPrevPerService() throws Exception {
         Mockito.when(event4.getService()).thenReturn("service-B");
         events.add(event4);
 
-        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyPluginApiServiceTracker, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
         final List<BusinessAccountTransitionModelDao> result = ImmutableList.<BusinessAccountTransitionModelDao>copyOf(factory.createBusinessAccountTransitions(businessContextFactory, Lists.reverse(events)));
         Assert.assertEquals(result.get(0).getService(), "service-A");
         Assert.assertEquals(result.get(0).getStartDate().compareTo(new DateTime("2012-05-01")), 0);
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessBundleFactory.java b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessBundleFactory.java
index 8f5f3a7..f92e578 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessBundleFactory.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessBundleFactory.java
@@ -85,7 +85,7 @@ public void setUp() throws Exception {
         Mockito.when(subscriptionApi.getSubscriptionBundlesForAccountId(Mockito.<UUID>any(), Mockito.<TenantContext>any())).thenReturn(ImmutableList.<SubscriptionBundle>of(bundle));
         Mockito.when(subscriptionApi.getSubscriptionBundlesForExternalKey(Mockito.<String>any(), Mockito.<TenantContext>any())).thenReturn(ImmutableList.<SubscriptionBundle>of(bundle));
 
-        businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyPluginApiServiceTracker, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
         subscriptionFactory = new BusinessSubscriptionTransitionFactory();
     }
 
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessSubscriptionTransitionFactory.java b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessSubscriptionTransitionFactory.java
index dfbb583..905ab88 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessSubscriptionTransitionFactory.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/dao/factory/TestBusinessSubscriptionTransitionFactory.java
@@ -123,7 +123,7 @@ public void testRespectPrevPerService() throws Exception {
         Mockito.when(event7.getServiceName()).thenReturn(BusinessSubscriptionTransitionFactory.BILLING_SERVICE_NAME);
         events.add(event7);
 
-        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
+        final BusinessContextFactory businessContextFactory = new BusinessContextFactory(account.getId(), callContext, currencyPluginApiServiceTracker, currencyConversionDao, killbillAPI, osgiConfigPropertiesService, clock, analyticsConfigurationHandler);
         final List<BusinessSubscriptionTransitionModelDao> result = ImmutableList.<BusinessSubscriptionTransitionModelDao>copyOf(factory.buildTransitionsForBundle(businessContextFactory, account, bundle, events, currencyConverter, accountRecordId, tenantRecordId, ReportGroup.test));
         Assert.assertEquals(result.get(0).getEvent(), "START_ENTITLEMENT_UNSPECIFIED");
         Assert.assertEquals(result.get(0).getSubscriptionId(), subscriptionId1);
diff --git a/src/test/java/org/killbill/billing/plugin/analytics/utils/TestCurrencyConverter.java b/src/test/java/org/killbill/billing/plugin/analytics/utils/TestCurrencyConverter.java
index 48dd6af..540cd32 100644
--- a/src/test/java/org/killbill/billing/plugin/analytics/utils/TestCurrencyConverter.java
+++ b/src/test/java/org/killbill/billing/plugin/analytics/utils/TestCurrencyConverter.java
@@ -1,8 +1,8 @@
 /*
  * Copyright 2010-2014 Ning, Inc.
  * Copyright 2014-2020 Groupon, Inc
- * Copyright 2020-2020 Equinix, Inc
- * Copyright 2014-2020 The Billing Project, LLC
+ * Copyright 2020-2023 Equinix, Inc
+ * Copyright 2014-2023 The Billing Project, LLC
  *
  * The Billing Project licenses this file to you under the Apache License, version 2.0
  * (the "License"); you may not use this file except in compliance with the
@@ -22,11 +22,20 @@
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
+import org.killbill.billing.catalog.api.Currency;
+import org.killbill.billing.currency.api.boilerplate.RateImp.Builder;
+import org.killbill.billing.currency.plugin.api.CurrencyPluginApi;
 import org.killbill.billing.plugin.analytics.AnalyticsTestSuiteNoDB;
 import org.killbill.billing.plugin.analytics.dao.model.CurrencyConversionModelDao;
 import org.killbill.clock.DefaultClock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -36,8 +45,8 @@
 public class TestCurrencyConverter extends AnalyticsTestSuiteNoDB {
 
     @Test(groups = "fast")
-    public void testGetConvertedValue() throws Exception {
-        final Map<String, List<CurrencyConversionModelDao>> currencyConversions = ImmutableMap.<String, List<CurrencyConversionModelDao>>of(
+    public void testGetConvertedValueStatic() throws Exception {
+        final Map<String, List<CurrencyConversionModelDao>> staticCurrencyConversions = ImmutableMap.<String, List<CurrencyConversionModelDao>>of(
                 "EUR", ImmutableList.<CurrencyConversionModelDao>of(
                         new CurrencyConversionModelDao("EUR", new LocalDate(2012, 7, 1), new LocalDate(2012, 7, 31), new BigDecimal("1.1"), "USD"),
                         new CurrencyConversionModelDao("EUR", new LocalDate(2012, 8, 1), new LocalDate(2012, 8, 31), new BigDecimal("1.2"), "USD"),
@@ -45,14 +54,65 @@ public void testGetConvertedValue() throws Exception {
                         // Overlap!
                         new CurrencyConversionModelDao("EUR", new LocalDate(2012, 9, 15), new LocalDate(2012, 9, 30), new BigDecimal("1.5"), "USD"),
                         new CurrencyConversionModelDao("EUR", new LocalDate(2012, 10, 1), new LocalDate(2012, 10, 31), new BigDecimal("1.6"), "USD"))
-                                                                                                                                           );
+                                                                                                                                                 );
+        final CurrencyConversions currencyConversions = new StaticCurrencyConversions(staticCurrencyConversions);
         final CurrencyConverter currencyConverter = new CurrencyConverter(new DefaultClock(), "USD", currencyConversions);
+        conversionsAssertions(currencyConverter);
 
+        // Specific behaviors
+        Assert.assertNull(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 11, 1)));
+        // Test overlap behavior
+        Assert.assertEquals(new BigDecimal("15").compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 15))), 0);
+    }
+
+    @Test(groups = "fast")
+    public void testGetConvertedValueAPI() {
+        final CurrencyPluginApi currencyPluginApi = Mockito.mock();
+        Mockito.when(currencyPluginApi.getRates(Mockito.eq(Currency.USD), Mockito.any()))
+               .thenAnswer(new Answer<>() {
+                   @Override
+                   public Object answer(final InvocationOnMock invocationOnMock) {
+                       final DateTime conversionDate = invocationOnMock.getArgument(1);
+
+                       final Builder rateBuilder = new Builder<>().withBaseCurrency(Currency.USD)
+                                                                  .withCurrency(Currency.EUR);
+                       if (!conversionDate.isAfter(new DateTime(2012, 6, 30, 0, 0, DateTimeZone.UTC))) {
+                           return null;
+                       } else if (!conversionDate.isAfter(new DateTime(2012, 7, 31, 0, 0, DateTimeZone.UTC))) {
+                           rateBuilder.withConversionDate(new DateTime(2012, 7, 1, 0, 0, DateTimeZone.UTC))
+                                      .withValue(new BigDecimal("1.1"));
+                       } else if (!conversionDate.isAfter(new DateTime(2012, 8, 31, 0, 0, DateTimeZone.UTC))) {
+                           rateBuilder.withConversionDate(new DateTime(2012, 8, 1, 0, 0, DateTimeZone.UTC))
+                                      .withValue(new BigDecimal("1.2"));
+                       } else if (!conversionDate.isAfter(new DateTime(2012, 9, 15, 0, 0, DateTimeZone.UTC))) {
+                           rateBuilder.withConversionDate(new DateTime(2012, 9, 1, 0, 0, DateTimeZone.UTC))
+                                      .withValue(new BigDecimal("1.4"));
+                       } else if (!conversionDate.isAfter(new DateTime(2012, 9, 30, 0, 0, DateTimeZone.UTC))) {
+                           rateBuilder.withConversionDate(new DateTime(2012, 9, 16, 0, 0, DateTimeZone.UTC))
+                                      .withValue(new BigDecimal("1.5"));
+                       } else {
+                           rateBuilder.withConversionDate(new DateTime(2012, 10, 1, 0, 0, DateTimeZone.UTC))
+                                      .withValue(new BigDecimal("1.6"));
+                       }
+
+                       return Set.of(rateBuilder.build());
+                   }
+               });
+
+        final CurrencyConversions currencyConversions = new CurrencyPluginApiCurrencyConversions(currencyPluginApi, Currency.USD);
+        final CurrencyConverter currencyConverter = new CurrencyConverter(new DefaultClock(), "USD", currencyConversions);
+        conversionsAssertions(currencyConverter);
+
+        // Specific behaviors
+        Assert.assertEquals(new BigDecimal("16").compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 11, 1))), 0);
+        Assert.assertEquals(new BigDecimal("14").compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 15))), 0);
+    }
+
+    private void conversionsAssertions(final CurrencyConverter currencyConverter) {
         // No data for currency
         Assert.assertNull(currencyConverter.getConvertedValue(BigDecimal.TEN, "FOO", new LocalDate(2012, 9, 1)));
         // No data for date
         Assert.assertNull(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 6, 30)));
-        Assert.assertNull(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 11, 1)));
 
         final BigDecimal expectedResult1 = new BigDecimal("11");
         Assert.assertEquals(expectedResult1.compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 7, 1))), 0);
@@ -67,9 +127,8 @@ public void testGetConvertedValue() throws Exception {
         final BigDecimal expectedResult3 = new BigDecimal("14");
         Assert.assertEquals(expectedResult3.compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 1))), 0);
         Assert.assertEquals(expectedResult3.compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 14))), 0);
-        // Test overlap behavior
+
         final BigDecimal expectedResult4 = new BigDecimal("15");
-        Assert.assertEquals(expectedResult4.compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 15))), 0);
         Assert.assertEquals(expectedResult4.compareTo(currencyConverter.getConvertedValue(BigDecimal.TEN, "EUR", new LocalDate(2012, 9, 30))), 0);
 
         final BigDecimal expectedResult5 = new BigDecimal("16");