Removed duplicate constants
replace double hierarchy for signature cache with Guava caches