Code refactoring
Added logging and minor fixes on eviction and cache size