Merge "Sonar-CachingFileAccess.java"