Cache functions updated for all platforms