Change name cache to chunk
Small fixes on models