Unrelated to this commit, but shouldn't it be an error if the value in the intermediate cache is null? (line 149/155)