code cleaning
Reverted cache handling