applied patch
rename cache variable and keys