v1.2.0 better code and cache management