Merge "Sonar Fix: CacheInfoDAO.java"