diff --git a/lib/common/cache_file_store.rb b/lib/common/cache_file_store.rb
index e8f0a3cb..71bf33c5 100644
--- a/lib/common/cache_file_store.rb
+++ b/lib/common/cache_file_store.rb
@@ -51,7 +51,7 @@ class CacheFileStore
     end
   end
 
-  def get(key)
+  def read_entry(key)
     entry_file_path = get_entry_file_path(key)
 
     if File.exists?(entry_file_path)
@@ -59,7 +59,7 @@ class CacheFileStore
     end
   end
 
-  def set(key, data_to_store, cache_timeout)
+  def write_entry(key, data_to_store, cache_timeout)
     if cache_timeout > 0
       File.open(get_entry_file_path(key), 'w') do |f|
         f.write(@serializer.dump(data_to_store))
diff --git a/spec/lib/common/cache_file_store_spec.rb b/spec/lib/common/cache_file_store_spec.rb
index c18b93d8..7a26f0b8 100644
--- a/spec/lib/common/cache_file_store_spec.rb
+++ b/spec/lib/common/cache_file_store_spec.rb
@@ -20,15 +20,12 @@
 require 'spec_helper'
 
 describe CacheFileStore do
-
-  before :all do
-    @cache_dir = SPEC_CACHE_DIR + '/cache_file_store'
-  end
+  let(:cache_dir) { SPEC_CACHE_DIR + '/cache_file_store' }
 
   before :each do
-    Dir.delete(@cache_dir) rescue nil
+    Dir.delete(cache_dir) rescue nil
 
-    @cache = CacheFileStore.new(@cache_dir)
+    @cache = CacheFileStore.new(cache_dir)
   end
 
   after :each do
@@ -37,7 +34,7 @@ describe CacheFileStore do
 
   describe '#storage_path' do
     it 'returns the storage path given in the #new' do
-      @cache.storage_path.should == @cache_dir
+      @cache.storage_path.should == cache_dir
     end
   end
 
@@ -52,39 +49,39 @@ describe CacheFileStore do
     it "should remove all files from the cache dir (#{@cache_dir}" do
       # let's create some files into the directory first
       (0..5).each do |i|
-        File.new(@cache_dir + "/file_#{i}.txt", File::CREAT)
+        File.new(cache_dir + "/file_#{i}.txt", File::CREAT)
       end
 
-      count_files_in_dir(@cache_dir, 'file_*.txt').should == 6
+      count_files_in_dir(cache_dir, 'file_*.txt').should == 6
       @cache.clean
-      count_files_in_dir(@cache_dir).should == 0
+      count_files_in_dir(cache_dir).should == 0
     end
   end
 
-  describe '#get (nonexistent entry)' do
+  describe '#read_entry (nonexistent entry)' do
     it 'should return nil' do
-      @cache.get(Digest::SHA1.hexdigest('hello world')).should be_nil
+      @cache.read_entry(Digest::SHA1.hexdigest('hello world')).should be_nil
     end
   end
 
-  describe '#set, #get' do
+  describe '#write_entry, #read_entry' do
 
     after :each do
-      @cache.set(@key, @data, @timeout)
-      @cache.get(@key).should === @expected
+      @cache.write_entry(@key, @data, @timeout)
+      @cache.read_entry(@key).should === @expected
     end
 
     it 'should get the correct entry (string)' do
-      @timeout = 10
-      @key = 'some_key'
-      @data = 'Hello World !'
+      @timeout  = 10
+      @key      = 'some_key'
+      @data     = 'Hello World !'
       @expected = @data
     end
 
     it 'should not write the entry' do
-      @timeout = 0
-      @key = 'another_key'
-      @data = 'Another Hello World !'
+      @timeout  = 0
+      @key      = 'another_key'
+      @data     = 'Another Hello World !'
       @expected = nil
     end