Removed cached values from methods