Moved to Guava Cache for CompatabilityManager