[BUGFIX] Respect table mapping on caching