diff --git a/ql/termstructures/volatility/swaption/swaptionvolcube.cpp b/ql/termstructures/volatility/swaption/swaptionvolcube.cpp
index fefda9d4c88..69df03aefdf 100644
--- a/ql/termstructures/volatility/swaption/swaptionvolcube.cpp
+++ b/ql/termstructures/volatility/swaption/swaptionvolcube.cpp
@@ -76,8 +76,6 @@ namespace QuantLib {
                    swapIndexBase_->tenor() << ")");
 
         registerWithVolatilitySpread();
-        registerWith(Settings::instance().evaluationDate());
-        evaluationDate_ = Settings::instance().evaluationDate();
     }
 
     void SwaptionVolatilityCube::registerWithVolatilitySpread()
diff --git a/ql/termstructures/volatility/swaption/swaptionvoldiscrete.cpp b/ql/termstructures/volatility/swaption/swaptionvoldiscrete.cpp
index 67f0d2b47bc..4b7fe1d3ea5 100644
--- a/ql/termstructures/volatility/swaption/swaptionvoldiscrete.cpp
+++ b/ql/termstructures/volatility/swaption/swaptionvoldiscrete.cpp
@@ -37,6 +37,8 @@ namespace QuantLib {
       optionDates_(nOptionTenors_),
       optionTimes_(nOptionTenors_),
       optionDatesAsReal_(nOptionTenors_),
+      optionInterpolatorTimes_(nOptionTenors_  + 1),
+      optionInterpolatorDatesAsReal_(nOptionTenors_ + 1),
       nSwapTenors_(swapTenors.size()),
       swapTenors_(swapTenors),
       swapLengths_(nSwapTenors_) {
@@ -47,14 +49,12 @@ namespace QuantLib {
         checkSwapTenors();
         initializeSwapLengths();
 
-        optionInterpolator_= LinearInterpolation(optionTimes_.begin(),
-                                                 optionTimes_.end(),
-                                                 optionDatesAsReal_.begin());
+        optionInterpolator_= LinearInterpolation(optionInterpolatorTimes_.begin(),
+                                                 optionInterpolatorTimes_.end(),
+                                                 optionInterpolatorDatesAsReal_.begin());
         optionInterpolator_.update();
         optionInterpolator_.enableExtrapolation();
-
-        registerWith(Settings::instance().evaluationDate());
-        evaluationDate_ = Settings::instance().evaluationDate();
+        cachedReferenceDate_ = referenceDate();
     }
 
     SwaptionVolatilityDiscrete::SwaptionVolatilityDiscrete(
@@ -70,6 +70,8 @@ namespace QuantLib {
       optionDates_(nOptionTenors_),
       optionTimes_(nOptionTenors_),
       optionDatesAsReal_(nOptionTenors_),
+      optionInterpolatorTimes_(nOptionTenors_  + 1),
+      optionInterpolatorDatesAsReal_(nOptionTenors_ + 1),
       nSwapTenors_(swapTenors.size()),
       swapTenors_(swapTenors),
       swapLengths_(nSwapTenors_) {
@@ -80,9 +82,9 @@ namespace QuantLib {
         checkSwapTenors();
         initializeSwapLengths();
 
-        optionInterpolator_= LinearInterpolation(optionTimes_.begin(),
-                                                 optionTimes_.end(),
-                                                 optionDatesAsReal_.begin());
+        optionInterpolator_= LinearInterpolation(optionInterpolatorTimes_.begin(),
+                                                 optionInterpolatorTimes_.end(),
+                                                 optionInterpolatorDatesAsReal_.begin());
         optionInterpolator_.update();
         optionInterpolator_.enableExtrapolation();
     }
@@ -100,6 +102,8 @@ namespace QuantLib {
       optionDates_(optionDates),
       optionTimes_(nOptionTenors_),
       optionDatesAsReal_(nOptionTenors_),
+      optionInterpolatorTimes_(nOptionTenors_  + 1),
+      optionInterpolatorDatesAsReal_(nOptionTenors_ + 1),
       nSwapTenors_(swapTenors.size()),
       swapTenors_(swapTenors),
       swapLengths_(nSwapTenors_) {
@@ -110,9 +114,9 @@ namespace QuantLib {
         checkSwapTenors();
         initializeSwapLengths();
 
-        optionInterpolator_= LinearInterpolation(optionTimes_.begin(),
-                                                 optionTimes_.end(),
-                                                 optionDatesAsReal_.begin());
+        optionInterpolator_= LinearInterpolation(optionInterpolatorTimes_.begin(),
+                                                 optionInterpolatorTimes_.end(),
+                                                 optionInterpolatorDatesAsReal_.begin());
         optionInterpolator_.update();
         optionInterpolator_.enableExtrapolation();
     }
@@ -152,17 +156,20 @@ namespace QuantLib {
     }
 
     void SwaptionVolatilityDiscrete::initializeOptionDatesAndTimes() const {
+        optionInterpolatorDatesAsReal_[0] = static_cast<Real>(referenceDate().serialNumber());
         for (Size i=0; i<nOptionTenors_; ++i) {
             optionDates_[i] = optionDateFromTenor(optionTenors_[i]);
-            optionDatesAsReal_[i] =
+            optionDatesAsReal_[i] = optionInterpolatorDatesAsReal_[i + 1] =
                 static_cast<Real>(optionDates_[i].serialNumber());
         }
         initializeOptionTimes();
     }
 
     void SwaptionVolatilityDiscrete::initializeOptionTimes() const {
-        for (Size i=0; i<nOptionTenors_; ++i)
-            optionTimes_[i] = timeFromReference(optionDates_[i]);
+        optionInterpolatorTimes_[0] = 0.0;
+        for (Size i = 0; i < nOptionTenors_; ++i) {
+            optionTimes_[i] = optionInterpolatorTimes_[i + 1] = timeFromReference(optionDates_[i]);
+        }
     }
 
     void SwaptionVolatilityDiscrete::initializeSwapLengths() const {
@@ -173,9 +180,8 @@ namespace QuantLib {
     void SwaptionVolatilityDiscrete::performCalculations() const {
         // recalculate dates if necessary...
         if (moving_) {
-            Date d = Settings::instance().evaluationDate();
-            if (evaluationDate_ != d) {
-                evaluationDate_ = d;
+            if (cachedReferenceDate_ != referenceDate()) {
+                cachedReferenceDate_ = referenceDate();
                 initializeOptionDatesAndTimes();
                 initializeSwapLengths();
                 optionInterpolator_.update();
diff --git a/ql/termstructures/volatility/swaption/swaptionvoldiscrete.hpp b/ql/termstructures/volatility/swaption/swaptionvoldiscrete.hpp
index 454a815118b..fce6b686d6f 100644
--- a/ql/termstructures/volatility/swaption/swaptionvoldiscrete.hpp
+++ b/ql/termstructures/volatility/swaption/swaptionvoldiscrete.hpp
@@ -73,13 +73,15 @@ namespace QuantLib {
         std::vector<Period> optionTenors_;
         mutable std::vector<Date> optionDates_;
         mutable std::vector<Time> optionTimes_;
-        mutable std::vector<Real> optionDatesAsReal_;
         mutable Interpolation optionInterpolator_;
+        mutable std::vector<Real> optionDatesAsReal_;
+        mutable std::vector<Time> optionInterpolatorTimes_;
+        mutable std::vector<Real> optionInterpolatorDatesAsReal_;
 
         Size nSwapTenors_;
         std::vector<Period> swapTenors_;
         mutable std::vector<Time> swapLengths_;
-        mutable Date evaluationDate_;
+        mutable Date cachedReferenceDate_;
       private:
         void checkOptionTenors() const;
         void checkOptionDates(const Date& reference) const;