Merge "Sonar Fix: Cached.java"