Fixed namespace
Implemented item cache