Update surface cache optimization to master; minor fixes Fix mixed EOL Remove unused include; change null bindings to 0