Fixed a number of issues with the binary cache key change (mostly the static member access).