Added cache bypassing and null handling.