diff --git a/contrib/clustering/CHANGES.txt b/contrib/clustering/CHANGES.txt
index 976f187a792..7ff61d95ddd 100644
--- a/contrib/clustering/CHANGES.txt
+++ b/contrib/clustering/CHANGES.txt
@@ -8,6 +8,10 @@ CHANGES
 
 $Id:$
 
+================== Release 1.5-dev ==================
+
+* SOLR-1684: Switch to use the SolrIndexSearcher.doc(int, Set<String>) method b/c it can use the document cache (gsingers)
+
 ================== Release 1.4.0 ==================
 
 Solr Clustering will be released for the first time in Solr 1.4.  See http://wiki.apache.org/solr/ClusteringComponent
diff --git a/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
index ecd218bc246..e2cbfa76831 100644
--- a/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
+++ b/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java
@@ -152,8 +152,7 @@ public class CarrotClusteringEngine extends SearchClusteringEngine {
 
     SolrIndexSearcher searcher = sreq.getSearcher();
     List<Document> result = new ArrayList<Document>(docList.size());
-    FieldSelector fieldSelector = new SetBasedFieldSelector(fieldsToLoad,
-            Collections.emptySet());
+
     float[] scores = {1.0f};
     int[] docsHolder = new int[1];
     Query theQuery = query;
@@ -161,7 +160,7 @@ public class CarrotClusteringEngine extends SearchClusteringEngine {
     while (docsIter.hasNext()) {
       Integer id = docsIter.next();
       org.apache.lucene.document.Document doc = searcher.doc(id,
-              fieldSelector);
+              fieldsToLoad);
       String snippet = getValue(doc, snippetField);
       if (produceSummary == true) {
         docsHolder[0] = id.intValue();