Removed the  usage of common values for caches, some minor changes