Merge "Move CacheDependency classes to own files"