changed cache class rendering for new structure
fixed tests