REMOVE: old smelly caching code... untested