Fixes with cache static