1 files changed, 2 insertions, 17 deletions
diff --git a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
index 1f90587abb..1393f6c4eb 100644
--- a/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
+++ b/core/src/main/java/org/elasticsearch/search/internal/SearchContext.java
@@ -118,8 +118,6 @@ public abstract class SearchContext extends AbstractRefCounted implements Releas
         }
     }
 
-    private boolean canCache = true;
-
     @Override
     protected final void closeInternal() {
         try {
@@ -162,21 +160,14 @@ public abstract class SearchContext extends AbstractRefCounted implements Releas
 
     public abstract long getOriginNanoTime();
 
-    public final long nowInMillis() {
-        markAsNotCachable();
-        return nowInMillisImpl();
-    }
-
     public final boolean isCachable() {
-        return canCache;
+        return getQueryShardContext().isCachable();
     }
 
     public final void resetCanCache() {
-        this.canCache = true;
+        getQueryShardContext().setCachabe(true);
     }
 
-    protected abstract long nowInMillisImpl();
-
     public abstract ScrollContext scrollContext();
 
     public abstract SearchContext scrollContext(ScrollContext scroll);
@@ -238,8 +229,6 @@ public abstract class SearchContext extends AbstractRefCounted implements Releas
 
     public abstract SimilarityService similarityService();
 
-    public abstract ScriptService scriptService();
-
     public abstract BigArrays bigArrays();
 
     public abstract BitsetFilterCache bitsetFilterCache();
@@ -402,10 +391,6 @@ public abstract class SearchContext extends AbstractRefCounted implements Releas
     /** Return a view of the additional query collectors that should be run for this context. */
     public abstract Map<Class<?>, Collector> queryCollectors();
 
-    public final void markAsNotCachable() {
-        this.canCache = false;
-    }
-
     /**
      * The life time of an object that is used during search execution.
      */