Cache functions modified