Merge pull request #51 from Doha2012/master

Add GuavaCacheTest class to guava
Merge pull request #52 from Doha2012/master

Modify GuavaCacheTest
guava cleanup
Merge remote-tracking branch 'upstream/master'