Disassemble some obsolete caching code, slight performance increase.