Merge "Cache.java: Fixed sonar issue"