Fixes cache issues