Maybe this fixes the cache issue?