Index: lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java
===================================================================
--- lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java	(revision 2144)
+++ lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexOutput.java	(revision )
@@ -26,6 +26,7 @@
 import org.apache.lucene.store.IndexOutput;
 import org.infinispan.AdvancedCache;
 import org.infinispan.context.Flag;
+import org.infinispan.util.Util;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 
@@ -146,6 +147,8 @@
       cache.startBatch();
       // add chunk to cache
       cache.withFlags(Flag.SKIP_REMOTE_LOOKUP).put(key, bufferToFlush);
+      if (log.isTraceEnabled()) log.trace("Write under key {0} value {1}", key, Util.printArray(bufferToFlush, false));
+
       // override existing file header with new size and last time access
       cache.withFlags(Flag.SKIP_REMOTE_LOOKUP).put(fileKey, file);
       cache.endBatch(true);
Index: lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java
===================================================================
--- lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java	(revision 2152)
+++ lucene-directory/src/main/java/org/infinispan/lucene/SingleChunkIndexInput.java	(revision )
@@ -27,6 +27,9 @@
 import org.apache.lucene.store.IndexInput;
 import org.infinispan.AdvancedCache;
 import org.infinispan.context.Flag;
+import org.infinispan.util.Util;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 
 /**
  * SingleChunkIndexInput can be used instead of InfinispanIndexInput to read a segment
@@ -40,6 +43,8 @@
  */
 public class SingleChunkIndexInput extends IndexInput {
 
+   private static final Log log = LogFactory.getLog(SingleChunkIndexInput.class);
+
    private final byte[] buffer;
    private int bufferPosition;
 
@@ -49,6 +54,8 @@
       if (buffer == null) {
          throw new FileNotFoundException("Chunk value could not be found for key " + key);
       }
+      if (log.isTraceEnabled()) log.trace("Read from key {0} value {1}", key, Util.printArray(buffer, false));
+
       bufferPosition = 0;
    }
 
Index: core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	(revision 2030)
+++ core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java	(revision )
@@ -179,6 +179,7 @@
          try {
             is = new FileInputStream(bucketFile);
             bucket = (Bucket) objectFromInputStreamInReentrantMode(is);
+            if (log.isTraceEnabled()) log.trace("Bucket read from file {0} is: {1}", bucketFile, bucket);
          } catch (Exception e) {
             String message = "Error while reading from file: " + bucketFile.getAbsoluteFile();
             log.error(message, e);
@@ -198,6 +199,7 @@
       if (f.exists()) {
          if (!deleteFile(f)) log.warn("Had problems removing file {0}", f);
       } else if (log.isTraceEnabled()) {
+         // TODO: Is this else correct? Looks to me it belongs to the inner deleteFile if and not the external one for exists
          log.trace("Successfully deleted file: '" + f.getName() + "'");
       }
 
@@ -208,6 +210,7 @@
             fos = new FileOutputStream(f);
             fos.write(bytes);
             fos.flush();
+            if (log.isTraceEnabled()) log.trace("Written bucket to file {0} is: {1}", f, b);
          } catch (IOException ex) {
             log.error("Exception while saving bucket " + b, ex);
             throw new CacheLoaderException(ex);
Index: core/src/main/java/org/infinispan/loaders/bucket/Bucket.java
===================================================================
--- core/src/main/java/org/infinispan/loaders/bucket/Bucket.java	(revision 599)
+++ core/src/main/java/org/infinispan/loaders/bucket/Bucket.java	(revision )
@@ -33,14 +33,14 @@
       return entries.get(key);
    }
 
-   public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-      int sz = in.readInt();
-      entries = new HashMap<Object, InternalCacheEntry>(sz);
-      for (int i = 0; i < sz; i++) {
-         InternalCacheEntry se = (InternalCacheEntry) in.readObject();
-         entries.put(se.getKey(), se);
-      }
-   }
+//   public final void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+//      int sz = in.readInt();
+//      entries = new HashMap<Object, InternalCacheEntry>(sz);
+//      for (int i = 0; i < sz; i++) {
+//         InternalCacheEntry se = (InternalCacheEntry) in.readObject();
+//         entries.put(se.getKey(), se);
+//      }
+//   }
 
    public Map<Object, InternalCacheEntry> getEntries() {
       return entries;