added work around for bad cache