Compile fix, missing bits in EntityCache, and formatting changes