Merge AssetCache fix