bugfixes and optimizations for cached find methods. Ensuring that static is marked on all method fields.
bugfixes and optimizations for cached find methods. Ensuring that static
is marked on all method fields.


Former-commit-id: c70b800268c05d2a8bbb8143e44d174405090405 [formerly 23609f6f94a9f47d82537fdf65bb33576d1e9a51]
Former-commit-id: 2040d6960e3aa14831cd4ef3165585b0631a1255
andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar,romancow/Sugar