Fixed issues with broken stat cache