Updated code to use the new cache and logger classes