platform-dependent caching fixes