refactored out non-cache items