Added Cache and Constants.