LPS-39057 LPS-38480 Include only important parts into cache file names
LPS-39057 LPS-38480 Remove unused code