Local cache usage needs to be fixed