Improve experimental cache system
Fix adding of empty meta