Fixed bugs which prevented most objects from being retrieved from cache