Use primitive maps in Cache.java when possible
Reorganized caches