tests renamed
Weak cache added