Merge remote-tracking branch 'fluffyfreak/sector-cache' into sector-cache
convert SectorCache to object