Removed collections-generic and replaced it's use with Guava Cache.