some renaming
introduce and use new pattern to access static classes correctly
added test for removeEldestEntry