[ANALYZER-2391] - Unit tests, refactorings for cache.