Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 18212)
+++ trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 18213)
@@ -163,5 +163,5 @@
 
     private static boolean useBlockCache() {
-        return USE_BLOCK_CACHE.get() == Boolean.TRUE;
+        return Boolean.TRUE.equals(USE_BLOCK_CACHE.get());
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 18212)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java	(revision 18213)
@@ -140,5 +140,5 @@
     public List<PluginInformation> getSelectedPlugins() {
         return availablePlugins.stream()
-                .filter(pi -> selectedPluginsMap.get(pi) == Boolean.TRUE)
+                .filter(pi -> Boolean.TRUE.equals(selectedPluginsMap.get(pi)))
                 .collect(Collectors.toList());
     }