Remove CachedValue and SafeValue for clarity and size